Scene Saving and Minor Fixes