Markup and grammar fixes