Changed mouse input scaling
Merged changes