fixing some things up
Merge branch 'master' of https://github.com/ervanalb/cesspool