Added/edited some comments