New key bindings + minor fixes.