review model fixes