Bug fixes
Specs and Controller updates