assorted tweaks