Grammer and markup fixes

Port of grammer fix from 0.7 branch and a markup fix.