Revamped SurveyApp, small changes to WDCSurvey..