bugfix and docs