updated gui, fixed more bugs