Add (bad) keyboard support for client
Cleanup