New functions simplify code.
Made some final modifications to the code.
Merge branch 'master' of github.com:petertbryant/ToxicsRedo