added search/edit/fixed bugs