Adding some debugging output to Survey to aid troubleshooting parsing problems
Incorporating master branch updates to the survey