final controller tweaks