bugfixes and dokumentation