General cleanup and keyboard support!
5/9/14