add search and a few more comments