Improved Date conversion formatting. Fixed bug with NaN types (still awaiting a new test case).