Code review
Review, rebuild docs