More surveytools, cleaning