Update the GUI and tests and fix many small things