add key shortcuts and minor fixes