changes to survey models and TODO comments for eLuciano11