fix all known issues for crab2 vs DBS3 as of March 1