bugfixing & documentation