Add taking survey functionality and other minor changes