Review comments from Peter Bugeia

Comments based on the V1.2 d2