all the tests pass, not full coverage yet
small clean up of gui