added remainder of fields, as well as some defaults