Fixing Load Survey and updating the Survey Class a bit