Small fixes everywhere
Merge branch 'master' of https://github.com/Satius/scripts