add comments, cold clean up