fixed up the ordering of the fields
Merge branch 'ledger' into testing