Software and postmortem grammar

Software syntax updates as usual along with some short postmortem
grammar fixes