- fixed mouse and key events (still some work to do)