various improvals

...