added field formatting, added date fields