fixes
lots gui + bug fix