Added upper casing for different formats. Added counterpoint