general tweaks & updates

Note - untested in w2p
e&oe