small corrections + criterion update. #2