Fixes to things that have probably broken things that I'll fix again shortly
Merge branch 'master' of github.com:christopherrolfe198/scripts