improvements in survey module

- better handling of user input
- better admin