added comments and searching functionality