addressed Raman's comments
9 files changed