some fixes
some better gui