Mouse input + bugfix