Lots of fixes and enhancements involving field mapping and default values.