keyboard shortcuts, huge perf bugfix