Fix some inconsistencies so that the doc can be read top to bottom