more changes, gui added