Finish up outstanding additions to model and code and, to the extent possible, improve unit tests.