Made some updates to various methods in the main controller