Updated tidy-up and added a handful of super awesome key combos.