Tweaks to collisions between Mario and his twin
Some cleanup and fixes so we can build the game