Minor changes and comments