Some minor changes  to the code and comments.