Evaluator Updates

Updated the evaluators to take advantage of the new Flux map structure,
while also fixing some bugs in the process.