adding controller specs and some fixes