various tweaks/fixes