Bugfixes and additional documentation