Couple changes and some comments