Added better shortcuts, and other cool things