misc fixes/tweaks