diff --git a/EGnEgtUUID.h b/EGnEgtUUID.h
index 76cca4d..6244890 100644
--- a/EGnEgtUUID.h
+++ b/EGnEgtUUID.h
@@ -30,7 +30,9 @@ struct EgtUUID {
    unsigned short Data3 ;
    unsigned char  Data4[8] ;
    EgtUUID( void)
-         { Data1 = 0 ; Data2 = 0; Data3 = 0 ; memset( Data4, 0, 8) ; }
+         { Clear() ; }
+   bool Clear( void)
+         { Data1 = 0 ; Data2 = 0; Data3 = 0 ; memset( Data4, 0, 8) ; return true ; }
    bool operator ==( const EgtUUID& other) const
          { return ( Data1 == other.Data1 && Data2 == other.Data2 && Data3 == other.Data3 && 
                     memcmp( Data4, other.Data4, 8) == 0) ; }
diff --git a/EMkMachiningConst.h b/EMkMachiningConst.h
index b0ee6e8..d56c9e0 100644
--- a/EMkMachiningConst.h
+++ b/EMkMachiningConst.h
@@ -62,13 +62,13 @@ enum MpaType { MPA_NONE =                        0,
                MPA_CURVEUSE =      ( MPA_INT +  6),
                MPA_STEPTYPE =      ( MPA_INT +  7),
                MPA_SUBTYPE =       ( MPA_INT +  8),
-               MPA_TOOLSPEED =     ( MPA_DOU +  0),
-               MPA_TOOLFEED =      ( MPA_DOU +  1),
-               MPA_TOOLSTARTFEED = ( MPA_DOU +  2),
-               MPA_TOOLENDFEED =   ( MPA_DOU +  3),
-               MPA_TOOLTIPFEED =   ( MPA_DOU +  4),
-               MPA_TOOLOFFSR =     ( MPA_DOU +  5),
-               MPA_TOOLOFFSL =     ( MPA_DOU +  6),
+               MPA_SPEED =         ( MPA_DOU +  0),
+               MPA_FEED =          ( MPA_DOU +  1),
+               MPA_STARTFEED =     ( MPA_DOU +  2),
+               MPA_ENDFEED =       ( MPA_DOU +  3),
+               MPA_TIPFEED =       ( MPA_DOU +  4),
+               MPA_OFFSR =         ( MPA_DOU +  5),
+               MPA_OFFSL =         ( MPA_DOU +  6),
                MPA_DEPTH =         ( MPA_DOU +  7),      // solo set, get con MPA_DEPTH_STR      
                MPA_SIDEANGLE =     ( MPA_DOU +  8),
                MPA_APPROX =        ( MPA_DOU +  9),
@@ -93,7 +93,7 @@ enum MpaType { MPA_NONE =                        0,
                MPA_LOCOMPLEN =     ( MPA_DOU + 28),
                MPA_STARTADDLEN =   ( MPA_DOU + 29),
                MPA_ENDADDLEN =     ( MPA_DOU + 30),
-               MPA_OFFSET =        ( MPA_DOU + 31),      // solo set, get con MPA_OFFSET_STR
+               MPA_OFFSET =        ( MPA_DOU + 31),      // per forature solo set, get con MPA_OFFSET_STR
                MPA_STEPEXTARC =    ( MPA_DOU + 32),
                MPA_STEPINTARC =    ( MPA_DOU + 33),
                MPA_NAME =          ( MPA_STR +  0),