Changes to scene for merge, mostly aesthetic