updates to allow better formatting of fields