Revised commetns. Applied fixes.