* minor updates
* processed yusuf review comments