Documentation update + address bugfix.