Got scenes set up and working, general code cleaning