minor changes

and a few more comments