sonar_offset to m and clean up