Cleaned up some of the errors after moving scope variables back to child controllers.