Accidentally let this slip back in. Fixed again.
A few various little changes.