Made some modifications to the scene system.