diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4f095bdc0..7637fd1c7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 
 ### Added 🚀
 
--   Added regression test
 -   Add the folder name onto the floor on the first 3 layers to get a better overview of the map ([#1491](https://github.com/MaibornWolff/codecharta/issues/1491))
 -   UX Improvements related to labels allowing for user interaction #1404
     -   Labels can be hovered, hovering their corresponding node
diff --git a/visualization/app/codeCharta/ui/codeMap/rendering/boxGeometryGenerationHelper.ts b/visualization/app/codeCharta/ui/codeMap/rendering/boxGeometryGenerationHelper.ts
index 0ba820166e..5fca21d14c 100644
--- a/visualization/app/codeCharta/ui/codeMap/rendering/boxGeometryGenerationHelper.ts
+++ b/visualization/app/codeCharta/ui/codeMap/rendering/boxGeometryGenerationHelper.ts
@@ -198,8 +198,8 @@ export class BoxGeometryGenerationHelper {
 				data.addFace(indexBottomLeft, indexTopRight, indexTopLeft)
 				data.addFace(indexBottomLeft, indexBottomRight, indexTopRight)
 			} else {
-				// Collect floors from a depth of 1 until a depth of 3 to be stamped with the folder name as a label
-				// We skip the root folder because it makes no sense to label it.
+				// Collect floors from a depth of 0 until a depth of 3 to be stamped with the folder name as a label
+				// TODO provide conditions centrally for checking if a floor has to be labeled.
 				if (addingFloor && side === sides.top && node.mapNodeDepth >= 0 && node.mapNodeDepth < 3) {
 					data.saveFloorSurfaceInformation(node, minPos, maxPos)
 				}
diff --git a/visualization/app/codeCharta/ui/codeMap/rendering/geometryGenerator.ts b/visualization/app/codeCharta/ui/codeMap/rendering/geometryGenerator.ts
index a2a11d10b0..3e0dd3f2d2 100644
--- a/visualization/app/codeCharta/ui/codeMap/rendering/geometryGenerator.ts
+++ b/visualization/app/codeCharta/ui/codeMap/rendering/geometryGenerator.ts
@@ -280,6 +280,8 @@ export class GeometryGenerator {
 		context.textBaseline = "middle"
 
 		// consider font size for y position
+		// TODO fontSizeForNodeDepth is the wrong font size to consider
+		//  we must use the scaled font size instead.
 		const textPositionY = textCanvas.height - fontSizeForNodeDepth / 2
 		const textPositionX = textCanvas.width / 2
 
diff --git a/visualization/app/codeCharta/ui/codeMap/threeViewer/threeSceneService.ts b/visualization/app/codeCharta/ui/codeMap/threeViewer/threeSceneService.ts
index 857e5d6925..53ecdcd5f6 100755
--- a/visualization/app/codeCharta/ui/codeMap/threeViewer/threeSceneService.ts
+++ b/visualization/app/codeCharta/ui/codeMap/threeViewer/threeSceneService.ts
@@ -71,6 +71,7 @@ export class ThreeSceneService implements CodeMapPreRenderServiceSubscriber {
 	}
 
 	highlightBuildingsAfterSelect() {
+		// TODO dead code? Remove it please.
 		const state = this.storeService.getState()
 		this.getMapMesh().highlightBuilding(this.highlighted, this.selected, state, this.constantHighlight)
 	}
@@ -101,6 +102,8 @@ export class ThreeSceneService implements CodeMapPreRenderServiceSubscriber {
 	}
 
 	private resetMaterial(materials: Material[]) {
+		// TODO activate the function when the performance issue in updateCorrectMaterial() has been fixed.
+		return
 		const allNodes = this.mapMesh.getNodes()
 		for (const node of allNodes) {
 			for (const material of materials) {
diff --git a/visualization/app/codeCharta/util/treeMapGenerator.ts b/visualization/app/codeCharta/util/treeMapGenerator.ts
index 027c17b954..fae73c1d12 100755
--- a/visualization/app/codeCharta/util/treeMapGenerator.ts
+++ b/visualization/app/codeCharta/util/treeMapGenerator.ts
@@ -7,8 +7,8 @@ import { getMapResolutionScaleFactor } from "../ui/codeMap/codeMap.render.servic
 export type SquarifiedTreeMap = { treeMap: HierarchyRectangularNode<CodeMapNode>; height: number; width: number }
 
 const PADDING_SCALING_FACTOR = 0.4
-const DEFAULT_PADDING_FLOOR_LABEL_FROM_LEVEL_1  = 120
-const DEFAULT_PADDING_FLOOR_LABEL_FROM_LEVEL_2  = 95
+const DEFAULT_PADDING_FLOOR_LABEL_FROM_LEVEL_1 = 120
+const DEFAULT_PADDING_FLOOR_LABEL_FROM_LEVEL_2 = 95
 
 export function createTreemapNodes(map: CodeMapNode, state: State, metricData: NodeMetricData[], isDeltaState: boolean) {
 	const mapSizeResolutionScaling = getMapResolutionScaleFactor(state.files)