comment and little bugfixing