Cleaned up Surveyservice

and give all survey tools from frog at once