added functionality + improvements to GUI