General maintenance pull request

All sorts of general maintenance :D 
Built for 1.7.10 at time of writing