Several changes, mostly improvements to the gui