More field cleanup and additions.
Tidy up constructors.