fixed up more markup, minor edits