Improve Surface.

These fix failing tests.
Fix other failing surface tests.