Some gui work, some more test stuff, minor cleans/fixes