fixity fix fix

almost done knocking out controller errors