Some bug fixes @gui, implemented one step for gui