Started to fix some album artist related TODOs.