Comments added to classes and made some minor error corrections