corrected/added some more comments