Improved speed benchmarks by cleaning up training terms. Can also save models.

Loading models not quite working yet, saving is ok.