more documentation and bugfix