Fixed few minor issues and improved review model.