minor cleanup
beginning low tech work on complex fields