fixed/added some comments