review improvements & small bug fix