Added enharmonics, simplified notation for pitches.h