Surfaces are back. Text images (barely). Bug fixes.