a few general fixes
Merge branch 'master' of https://github.com/JFreegman/toxic into groupbot