Performance improvements (until I introduce Marionette).
Made certain parts a little less stupid.
UI tweaks.