Scene 3 and misc changes