better parsing of fields, some improvements to tests.