docs and bugfix