More toroplus stuff

I keep on finding more to fix.  Will release test build and see if all working yet.

Change-Id: Ieabfdc18731dcaa2d17ffac5a2d9e5bae36db8ea