Additional surveys

fixes #119 and #130