pretty much man.
i just updated it tonight to get the latest iphone update and most of my music 80% comes from CD's that i uploaded onto itunes. and from other sources. Dont buy music from itunes (too expensive) so even if i didn't buy from them and click on my music, it shows up on the right, with no way to turn it off (well i havent found a way yet) i guess if you buy alot from itunes then sure, its great. But so far, not a fan.