All comments added.  Version to submit for review.