bugfixing and better gui