More ms edits

Also strip trailing whitespace.
Most work is in the other software section.