survey updates and bug fixes