minor tweaks on control