Doc fixes

#### READY TO BE MERGED

@rallytime @whiteinge 
I'll make the changes right away!