small tweaks on Controller