Added Surveys, fixed schedules