fix up some tweaks