More docs
Fix bug from refactoring