bugfix + updated gui