fixed markup, few minor edits