add section for search
clean up some code
laptop commit 2