fixed some little bugs
Merge branch 'master' of https://github.com/tdotu/Cryolite
Merge branch 'master' of https://github.com/tdotu/Cryolite