Update benchamrks to work with latest criterion

+ some minor tweaks (mostly comments)