Fixes to comments
Reorder methods to match header file
Port cleanup/fixes from map to survey collections