synced with hermes
minor fixes (Fixed -> Adaptive Criterion)