collecting coins no longer causes the game to hand when in testMovie Mode

also various code cleanup