documentation + bugfixing