Some minor changes and comments