Markup fixes
Further edits to Markup. Changing from List<> to HashSet<>.