fixed markup, added comments