fix whitespace, fix numbering