Bunch of changes (checkin/survey)