clean up grabber code, fixes to tests