minor tweaks, still working on gui