bugfix and dox update