Small changes, added some comments