finalized comments, still need to add threadd comments, ui changes