peer review + minor fixes