minor changes to main controller