diff --git a/DDSegmentation/include/DDSegmentation/BitField64.h b/DDSegmentation/include/DDSegmentation/BitField64.h
index 0a22af37a36c237ac56cd1b3b9ba979f51588177..42b91c2cb3b9326efb4d15d81731c46bad458d30 100644
--- a/DDSegmentation/include/DDSegmentation/BitField64.h
+++ b/DDSegmentation/include/DDSegmentation/BitField64.h
@@ -12,8 +12,8 @@
 namespace DD4hep {
 
 //fixme: do  need to do this also for 32 bit machines ?
-typedef long long64 ;
-typedef unsigned long ulong64 ;
+typedef long long int long64 ;
+typedef unsigned long long ulong64 ;
 
 namespace DDSegmentation {
 
@@ -121,11 +121,11 @@ namespace DDSegmentation {
 
     /** The low  word, bits 0-31
      */
-    unsigned lowWord() const { return unsigned( _value &  0xffffFFFF )  ; } 
+    unsigned lowWord() const { return unsigned( _value &  0xffffFFFFUL )  ; } 
 
     /** The high  word, bits 32-63
      */
-    unsigned highWord() const { return unsigned( _value >> 32  ) ; } 
+    unsigned highWord() const { return unsigned(_value >> 32) ; } 
 
 
     /** Return a valid description string of all fields
@@ -154,9 +154,9 @@ namespace DDSegmentation {
     // -------------- data members:--------------
 
     std::vector<BitFieldValue*>  _fields ;
-    long64 _value ;
-    IndexMap _map ;
-    long64 _joined ;
+    long64    _value ;
+    IndexMap  _map ;
+    long64    _joined ;
 
 
   };
diff --git a/DDSegmentation/include/DDSegmentation/Segmentation.h b/DDSegmentation/include/DDSegmentation/Segmentation.h
index da499f12047bd3766529d1a6aa643cef29a1795a..5c6e1a3febee1bc8986029018a776f805b6f9ca7 100644
--- a/DDSegmentation/include/DDSegmentation/Segmentation.h
+++ b/DDSegmentation/include/DDSegmentation/Segmentation.h
@@ -49,10 +49,22 @@ public:
 	std::string fieldDescription() const {
 		return _decoder->fieldDescription();
 	}
+	/// access the segmentation name
+	const std::string& name() const {
+		return _name;
+	}
+	/// Set the segmentation name
+	void setName(const std::string& value)  {
+	  _name = value;
+	}
 	/// access the segmentation type
-	std::string type() const {
+	const std::string& type() const {
 		return _type;
 	}
+	/// Set the segmentation type
+	void setType(const std::string& value)  {
+	  _type = value;
+	}
 	/// access the underlying decoder
 	BitField64* decoder() {
 		return _decoder;
@@ -69,13 +81,8 @@ protected:
 	bool _ownsDecoder;
 	/// the segmentation type
 	std::string _type;
-	/// distinguish between local and global coordinate systems
-	bool _isLocal;
-
-	/// helper method to convert a bin number to a 1D position
-	double binToPosition(long64 bin, double cellSize, double offset = 0.) const;
-	/// helper method to convert a 1D position to a cell ID
-	int positionToBin(double position, double cellSize, double offset = 0.) const;
+	/// the segmentation name
+	std::string _name;
 };
 
 } /* namespace DDSegmentation */
diff --git a/DDSegmentation/src/BitField64.cpp b/DDSegmentation/src/BitField64.cpp
index 1deac192d1e09333caf91a02d513cdbbd12f4776..c98bd659ed25308a0caabe31cf82ab735738268b 100644
--- a/DDSegmentation/src/BitField64.cpp
+++ b/DDSegmentation/src/BitField64.cpp
@@ -72,22 +72,15 @@ namespace DDSegmentation {
     }
   }
 
-  long64 BitFieldValue::value(long64 id) const { 
-      
+  long64 BitFieldValue::value(long64 id) const {       
     if(  _isSigned   ) {
-
-      long64 val = ( id & _mask ) >> _offset ;
-      
-      if( ( val  & ( 1LL << ( _width - 1 ) ) ) != 0 ) { // negative value
-	  
-	val -= ( 1LL << _width );
+      long64 val = (id & _mask) >> _offset ;
+      if( (val  & (1LL << (_width - 1))) != 0 ) { // negative value
+	val -= (1LL << _width);
       }
-	
       return val ;
-
-    } else { 
-      
-      return  ( id & _mask ) >> _offset ;
+    } else {
+      return  (id & _mask) >> _offset ;
     }
   }