Even more changes with Scenes

More fixes for Skeleton. Everything should work now