More work on SurfaceInspector