Added keyboard shortcuts, fixed a few other things