Bugfix and Documentation update