more tweaks/fixes

Check commit msgs for info