fix UPS address bug
Cleanup...
Update 28/03
merged
merged, update entity, tests