Nothing in particular

Fixing merge conflict with scene stuff, played with movement valuess