Scenes updates + minor fixes