Adds fields_map flag and resume bug fixing

- fields_map flag to map dataset fields to model fields in evaluations
- fixes bugs in resume logic and related functions