Fixed #76. While I was at it also simplified the mouse listeners.
Removed some warnings across the project