fixes for scene 6 and 7