jh - fixed some scene changes