Turn off polling for now...
Fix numbering bug
Clean up some of the defines
Add command line support for keyboard events