Added a "benchmark" setting and some treatment.
Added the new version of flat universe constraints, but didn't branch them yet.