Fix #41
Cleanup
Add missing keystrokes.