More Scene Fixes Yay