minor changes. review comments and some minor modifications