Minor edits
Small tweaks to Gui interface and underlying functions