various tweaks/fixes
oops