added some fields, formatting, etc.