Added/deleted some comments