Fixed a few things and added date support