several improvements, but the GUI got broken