add more key shortcuts, other final fixes