add comments, ui change