misc small tweaks