Added some model classes; fixed comments