moe moe'room glitch and some fixes on github

moe moe'room glitch and some fixes on github
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks