small controller tweaks