updated to include NSDateFormatter categories