Version 2 - Level/Spawn Fixes