comments, html change, clean up