Fixes to songs controller.  Ready to start adding tests.