adjust names of params for cancancan
tweak specs for adjusted functionality