From Evgueni Tcherniaev:

- small improvement in DrawFaceMode2();
- fix of the order of drawing and clean up in SurfaceCartesian();