controller specs + fixes