Fixes, add some date parsing