Cleanup, GUI work and shadowJar