Misc Teddy Fluff fixes
Merge branch 'master' of https://github.com/orlando008/TeddysAdventure3