Add Level 2 and fix collision detection