Fixed minor bugs and made sure controllers got set to nil