Cleanup
Cleanup
Math improvement
Fixes
Cleanup
Removing deprecated bits
tpf => dt