fixed bugs in the model;
it is still not parameterized correctly...