add comments, todos