Revert "small changes and corrections that I think are non-controversial"

This reverts commit e26d46c3
4 jobs for master in 2 minutes and 16 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #1160
build-dev

00:00:41

 
  Deploy
passed #1161
deploy-dev

00:01:34

 
  Build Prod
manual #1162
manual
build-prod
 
  Deploy Prod
created #1163
deploy-prod