More work. Improvements to earlier commit, more work on GUIs