More text edits and fixed numbering problem