expr fleshing
merge
expr work
merges
fixes geo