Merge pull request #112 from dalehenrich/dev

tODE bugfixes and improvements accumulated during run-up to ESUG