Few survey design fixes

Fix #79.