addressed Sattam's review comments
27 files changed