added missing fields, fixed indents and tab order