More arrow trouble
Cleanups and more mouse movement stuff