Grab a program called Tag and Rename (I can send it to you if you want)... it's basically a lifesaver when it comes to tagging music.
There is a wee bit of a learning curve, but it is quite fast once you learn how. It can tag music based on filenames, alter filenames based on tags, mass apply...