Fixes #36, #38, and #39 -- /albums