addressed Ohmichi's review comments

addressed janetkuo's review comments

Addressed 2nd Round of reviewes from janetkuo

addressed 3rd round of review comments from janetkuo

addressedd foxish and janetkuo's review comments