diff --git a/wip-hugo/routines/memory/memcpy.s b/wip-hugo/routines/memory/memcpy.s
index 034dc0f..28b0958 100644
--- a/wip-hugo/routines/memory/memcpy.s
+++ b/wip-hugo/routines/memory/memcpy.s
@@ -15,14 +15,11 @@ change_length:
 
         DEC length +1
         BPL loop
-        JMP loop_end
+        RTS
 y_overflow:
         ;; Y is now 0
         INC B_start + 1
         INC A_start + 1
 
         jmp change_length
-loop_end:
-
-RTS
 .endproc
diff --git a/wip-hugo/routines/memory/memset.s b/wip-hugo/routines/memory/memset.s
index e5c5f62..082e20f 100755
--- a/wip-hugo/routines/memory/memset.s
+++ b/wip-hugo/routines/memory/memset.s
@@ -15,11 +15,9 @@ change_length:
 
         DEC length +1
         BPL loop
-        JMP loop_end
+        RTS
 y_overflow:
         ;; Y is now 0
         INC A_start + 1
         jmp change_length
-loop_end:
-        RTS
 .endproc
diff --git a/wip-hugo/source.s b/wip-hugo/source.s
index 72d5184..70912de 100755
--- a/wip-hugo/source.s
+++ b/wip-hugo/source.s
@@ -8,11 +8,11 @@
 .include "STARTUP.s"
 ;.include "dubbel_buffer/raster_irqs.s"
 
-.include "routines/line/line_test.s"
-.include "routines/text/char_draw_test.s"
+;.include "routines/line/line_test.s"
+;.include "routines/text/char_draw_test.s"
 ;.include "routines/pixel/pixel_test.s"
 ;.include "routines/memory/memcpy_test.s"
-;.include "routines/memory/memset_test.s"
+.include "routines/memory/memset_test.s"
 ;.include "routines/triangle/triangle_test.s"
 exit:
 JMP exit