adding comments.. will merge this branch 'off-line'