more updates from review comments and updated findSites