minor changes & adding gui
fix merge