code cleanup and bug fixes in Engagers data harvesting