more tests
more GUI rewrite done