Tweaked the GUI a bit and some more debugging