more bug fixes; added a find feature