fixed surface integration by reverting changes, see comment in the changed file with future idea
optilab simplification