small misc tweaks