Documentation and bugfixes