Update: Fix main controller bugs