Made compatible with CD 1.5. Also changed some things.