These are changes to make the slam_evaluator more useful and robust