add comments, fix layout