changes to survey loader and generator
merge conflicts