fix small bugs and update exit survey submission