Various bugs fix
Merge branch 'master' of github.com:Jamiiz/cataclysm