Various tweaking; getting ready for fields.