Fixed ordering of documentation
Fixed punctuation, fixed #2166