Fixed parsers, fixed some naming problems, added models.