Comments mostly done