Add comments, misc. changes.