Doc fixes

#### READY TO BE MERGED

@rallytime @whiteinge