some more tweaks for review.