Bug fixes, further progress

GUI now works for almost all data input.