bugfix and DOC update