Improved the GUI and other miscellaneous changes