Additional documentation and bugfixes