Fixed ORDER string generation
Improved NSDate handling
fixed typo