fixed a bunch of things.  a mostly calibrated model.