Cleanup, fix shortcuts.