A whole bunch of bugfixes and styling improvements