fix next for orderreview; some comments