Markup and grammar updates

Other than that, original idea mate!