Added features to GUI, fixed some issues with output