Picard

This fixes issues with both CD id'ing and file fingerprinting.