Better tone/drive settings
Factored the solutions to minimize arithmetic.
Added some data/cleanup