misc fixes, cleanups, tiny features and small performance improvements

[gdementen]

FWIW, this is in fact another pass at salvaging all commits which are ready from all my train branches.