More fixes and additions
Merge branch 'master' of https://github.com/ajk1311/ChaoticHippos