Minor changes -mostly comments