A lot of major bugfixes and ui tweaks (with much help from Franz).