more cleanup and shortcuts
enable shortcuts