diff --git a/src/controllers/functions/buildRig.ts b/src/controllers/functions/buildRig.ts
index d5c0da7..2b0f9cc 100644
--- a/src/controllers/functions/buildRig.ts
+++ b/src/controllers/functions/buildRig.ts
@@ -23,26 +23,18 @@ export function buildRig(scene: Scene, xr: WebXRDefaultExperience): Mesh {
     });
     for (const cam of scene.cameras) {
         cam.parent = cameratransform;
-        if (cam.getClassName() == "FreeCamera") {
-
-        } else {
-
-        }
     }
-
     scene.onActiveCameraChanged.add(() => {
         for (const cam of scene.cameras) {
             cam.parent = cameratransform;
-            if (cam.getClassName() == "FreeCamera") {
-            } else {
-            }
         }
         cameratransform.rotation.set(0, Math.PI, 0);
     });
     rigMesh.material = buildStandardMaterial("rigMaterial", scene, "#2222ff");
     rigMesh.setAbsolutePosition(new Vector3(0, .01, 4));
     rigMesh.isPickable = false;
-    new AxesViewer(scene, .25);
+    const axis = new AxesViewer(scene, .25);
+    axis.zAxis.rotation.y = Math.PI;
     rigMesh.lookAt(new Vector3(0, 0.01, 0));
     rigMesh.visibility = 1;
     const rigAggregate =
diff --git a/src/controllers/functions/grab.ts b/src/controllers/functions/grab.ts
index 9851638..dac7c73 100644
--- a/src/controllers/functions/grab.ts
+++ b/src/controllers/functions/grab.ts
@@ -1,7 +1,8 @@
 import {AbstractMesh, TransformNode} from "@babylonjs/core";
 import {DiagramManager} from "../../diagram/diagramManager";
 
-export function grabAndClone(diagramManager: DiagramManager, mesh: AbstractMesh, parent: AbstractMesh) {
+export function grabAndClone(diagramManager: DiagramManager, mesh: AbstractMesh, parent: AbstractMesh):
+    { transformNode: TransformNode, newMesh: AbstractMesh } {
     const newMesh = diagramManager.createCopy(mesh);
     const transformNode = new TransformNode("grabAnchor, this.scene");
     transformNode.id = "grabAnchor";
diff --git a/src/controllers/functions/reparent.ts b/src/controllers/functions/reparent.ts
index b7803f9..f18c3c5 100644
--- a/src/controllers/functions/reparent.ts
+++ b/src/controllers/functions/reparent.ts
@@ -7,9 +7,7 @@ export function reparent(mesh: AbstractMesh, previousParentId: string, grabbedMe
     if (previousParentId) {
         const parent = mesh.getScene().getMeshById(previousParentId);
         if (parent) {
-            //mesh && mesh.setParent(this.scene.getMeshById(this.previousParentId));
             logger.warn('not yet implemented')
-            //@note: this is not implemented yet
         } else {
             mesh.setParent(null);
         }
@@ -17,7 +15,6 @@ export function reparent(mesh: AbstractMesh, previousParentId: string, grabbedMe
         const parent = mesh.getScene().getTransformNodeById(grabbedMeshParentId);
         if (parent) {
             logger.warn('setting parent to null', grabbedMeshParentId, parent)
-            //this.grabbedMeshParentId = null;
             mesh.setParent(null);
             parent.dispose();
         } else {