fixed model configuration and typos in class definitions