Review and minor fixes