Survey Work and Fixes