Add Closetag and minor edits