Only a couple of small changes, mostly clean up and gui improvements