small tweaks on controllers