addressed raman's review comments
21 files changed