Clean up some click logic, fix aiming
Fixes #13