added more stuff for scene management (build now unstable)