diff --git a/wip-hugo/macros/16aritmatic.s b/wip-hugo/macros/16aritmatic.s
index a96902d..00b3ef5 100755
--- a/wip-hugo/macros/16aritmatic.s
+++ b/wip-hugo/macros/16aritmatic.s
@@ -81,7 +81,7 @@
 
 ;; Multiplication of 2
 ;; a = a*2
-.macro mult_16 low_, hi_, NOT_ROL
+.macro Mult_16 low_, hi_, NOT_ROL
 ;; IF NOT_ROL
 .ifblank fast_unsafe
         ASL low_
diff --git a/wip-hugo/routines/line/line_down.s b/wip-hugo/routines/line/line_down.s
index 6ad1b9f..dd2855e 100644
--- a/wip-hugo/routines/line/line_down.s
+++ b/wip-hugo/routines/line/line_down.s
@@ -40,10 +40,10 @@
         LDA dx
         SBC dy
         STA >V
-        mult_16 >V, <V
+        Mult_16 >V, <V
 
         ;dy_2 = dy*2
-        mult_16 >dy_2, <dy_2 ;>dy_2 = dy (same address)
+        Mult_16 >dy_2, <dy_2 ;>dy_2 = dy (same address)
 
         ;; This is an Bresenham's line algorithm, se wikipedia bellow.
         ;;https://en.wikipedia.org/wiki/Bresenham%27s_line_algorithm
diff --git a/wip-hugo/routines/line/line_down_inv.s b/wip-hugo/routines/line/line_down_inv.s
index 2bd10e3..d448a8f 100644
--- a/wip-hugo/routines/line/line_down_inv.s
+++ b/wip-hugo/routines/line/line_down_inv.s
@@ -26,9 +26,9 @@
         SEC
         SBC >V
         STA >V
-        mult_16 >V, <V
+        Mult_16 >V, <V
 
-        mult_16 >dx_2, <dx_2
+        Mult_16 >dx_2, <dx_2
 
         LDA >dx_2
         STA >D
diff --git a/wip-hugo/routines/line/line_up.s b/wip-hugo/routines/line/line_up.s
index a477e69..ebee45c 100644
--- a/wip-hugo/routines/line/line_up.s
+++ b/wip-hugo/routines/line/line_up.s
@@ -26,9 +26,9 @@
         SEC
         SBC >V
         STA >V
-        mult_16 >V, <V
+        Mult_16 >V, <V
 
-        mult_16 >dy_2, <dy_2, !
+        Mult_16 >dy_2, <dy_2, !
 
         LDA >dy_2
         STA >D
diff --git a/wip-hugo/routines/line/line_up_inv.s b/wip-hugo/routines/line/line_up_inv.s
index a3c43b0..39a61d5 100644
--- a/wip-hugo/routines/line/line_up_inv.s
+++ b/wip-hugo/routines/line/line_up_inv.s
@@ -27,9 +27,9 @@
         SEC
         SBC >V
         STA >V
-        mult_16 >V, <V
+        Mult_16 >V, <V
 
-        mult_16 >dx_2, <dx_2
+        Mult_16 >dx_2, <dx_2
 
         LDA >dx_2
         STA >D
diff --git a/wip-hugo/routines/memory/memcpy.s b/wip-hugo/routines/memory/memcpy.s
index 0bfdf06..8dc4749 100644
--- a/wip-hugo/routines/memory/memcpy.s
+++ b/wip-hugo/routines/memory/memcpy.s
@@ -30,7 +30,6 @@ loop:
         BNE loop
         ;BPL loop; Branch if Y dont overflow
         ;; Fix overflow
-        ;LDX #$23
         LDY #$00
         INC <A_start
         INC <B_start
diff --git a/wip-hugo/routines/memory/pixel_draw.s b/wip-hugo/routines/memory/pixel_draw.s
index 1108e05..9dfe791 100755
--- a/wip-hugo/routines/memory/pixel_draw.s
+++ b/wip-hugo/routines/memory/pixel_draw.s
@@ -62,16 +62,16 @@ end__:
 
 	;;We need to calculate C*40. 40 = 2*2*2*(2^2 +1)
 	;; _*2^2
-	mult_16 >C, <C
-	mult_16 >C, <C
+	Mult_16 >C, <C
+	Mult_16 >C, <C
 
 	;; + _*1
 	Add_16 >C, <C, >B, <B, !
 
 	;; *2*2*2
-	mult_16 >C, <C
-	mult_16 >C, <C
-	mult_16 >C, <C
+	Mult_16 >C, <C
+	Mult_16 >C, <C
+	Mult_16 >C, <C
 
 	Add_16 >btp_mem_pos, <btp_mem_pos, >C, <C, !
 
diff --git a/wip-hugo/routines/text/text.s b/wip-hugo/routines/text/text.s
index 45c350e..3b00033 100644
--- a/wip-hugo/routines/text/text.s
+++ b/wip-hugo/routines/text/text.s
@@ -28,8 +28,8 @@
         ;; *10 = 2*2*2 + 2
         ASL code ;Will never owerflow 8byte
         LDY code
-        mult_16 >petski_position, <petski_position ; May overflow 8byte (therefore using 16)
-        mult_16 >petski_position, <petski_position ; May overflow 8byte (therefore using 16)
+        Mult_16 >petski_position, <petski_position ; May overflow 8byte (therefore using 16)
+        Mult_16 >petski_position, <petski_position ; May overflow 8byte (therefore using 16)
         ;TYA
         ;Add_16_A >petski_position, <petski_position, #$00