Some more general glitch fixes.
Merge branch 'master' of https://github.com/Mayple7/SausageFox150