add some more checks for surface module improvements