Ctrl-C then Ctrl-P will become your best friend when using the Zune software to update your album information manually.
Even the slightest error in the information will place a single song in a whole new album (even if it could fit in one of the other already listed ones).