Fix #249 temporary
Cleanup and fix #234
Fix keyboardissues
Some performance tweaks