simplify master source with auto-vivification of assoc/update-in and fix bug in update flags (should update flag rather overwrite)