Fix Markup and Grammar