Fix various errors
Merge branch 'master' of https://github.com/andnp/Neat-Bot-Scripts