adding improvements one by one

[KlausVigo]

@liamrevell this seems to work and should be safe and runs nicely on your example.

[liamrevell]

Looks good. I merged these changes & nothing broke. Thanks Klaus!