Added Mousemovements
Cleanup