Some fixes to try and fix a bug in matedit.
AREA: Removed smurf.are