HTML done, minor edits elsewhere