diff --git a/scripts/addons/cam/__init__.py b/scripts/addons/cam/__init__.py
index a935e9e0..4b43f9f3 100644
--- a/scripts/addons/cam/__init__.py
+++ b/scripts/addons/cam/__init__.py
@@ -1076,7 +1076,7 @@ class CAM_MACHINE_Panel(bpy.types.Panel):
 				layout.prop(ao,'spindle_min')
 				layout.prop(ao,'spindle_max')
 				#layout.prop(ao,'spindle_default')
-				layout.prop(ao,'axis4')
+				#layout.prop(ao,'axis4')
 				#layout.prop(ao,'axis5')
 				#layout.prop(ao,'collet_size')
 
@@ -1316,7 +1316,7 @@ class CAM_OPERATION_PROPERTIES_Panel(bpy.types.Panel):
 		if len(scene.cam_operations)>0:
 			ao=scene.cam_operations[scene.cam_active_operation]
 			if ao.valid:
-				layout.prop(ao,'axes')
+				#layout.prop(ao,'axes')
 				if ao.axes=='3':
 					layout.prop(ao,'strategy')
 				elif ao.axes=='4':
diff --git a/scripts/addons/cam/utils.py b/scripts/addons/cam/utils.py
index 14cd2dc1..a73d0fbb 100644
--- a/scripts/addons/cam/utils.py
+++ b/scripts/addons/cam/utils.py
@@ -2733,7 +2733,7 @@ def chunksToMesh(chunks,o):
 		#lift and drop
 		
 		if lifted:
-			if o.axes=='3':
+			if o.axes=='3' or o.axes=='5':
 				v=(ch.points[0][0],ch.points[0][1],o.free_movement_height)
 			else:
 				v=ch.startpoints[0]#startpoints=retract points
@@ -2741,7 +2741,7 @@ def chunksToMesh(chunks,o):
 			verts.append(v)
 		
 		verts.extend(ch.points)
-		if o.axes!='3':
+		if o.axes!='3' and o.axes!='5':
 			verts_rotations.extend(ch.rotations)
 			
 		lift = True
@@ -2756,7 +2756,7 @@ def chunksToMesh(chunks,o):
 				lift=False
 			
 		if lift:
-			if o.axes== '3':
+			if o.axes== '3' or o.axes=='5':
 				v=(ch.points[-1][0],ch.points[-1][1],o.free_movement_height)
 			else:
 				v=ch.startpoints[-1]
@@ -5177,10 +5177,10 @@ def prepare5axisIndexed(o):
 	oriname=o.name+' orientation'
 	ori=s.objects[oriname]
 	
-	rot=ori.rotation_euler.copy()
-	rot.x=-rot.x
-	rot.y=-rot.y
-	rot.z=-rot.z
+	rot=ori.matrix_world.inverted()
+	#rot.x=-rot.x
+	#rot.y=-rot.y
+	#rot.z=-rot.z
 	rotationaxes = rotTo2axes(ori.rotation_euler,'CA')
 	
 	#bpy.context.space_data.pivot_point = 'CURSOR'