uses non-deprecated syntax for named scope
adds some controller comments
cleans up the controller specs