Clean up, and fix last.fm