prefab changes for scene transitions
some cleanup
fixing merge conflicts