Merging Sebastien's fix to the surface-sweep cod. Also, replaced all occurrences of '_SL_' with '_SS_'.