Surveying debugging

Improved surveying