started working on GUI and a little bug fix