changed some things
Merge branch 'scene'