Small bugfixes and keystroke-savers.