bugfix and more docs