Coverart fixes

Here's a more manageable PR :)

I've got some more coming.  I decided to delete my fork of sockso and start over, as it had a bunch of whitespace crap i couldn't get rid of easily, so I'm merging over my changes one-by-one from my old repo.