bugfix and doc