misc adjustments from review