Minor changes and some comments