tweaks to main controller