diff --git a/wip-hugo/STARTUP.s b/wip-hugo/STARTUP.s
index dea8caa..a065f3c 100755
--- a/wip-hugo/STARTUP.s
+++ b/wip-hugo/STARTUP.s
@@ -58,15 +58,15 @@ ORA Screen_RAM_settings
 STA Screen_RAM_settings
 
 ;;Paint the bitmap black. More bitmap: https://www.c64-wiki.com/wiki/53272, https://www.c64-wiki.com/wiki/Screen_RAM#Moving_of_screen_RAM
-Mov_16 >B_start, <B_start, #<VIC_bank, #>VIC_bank
-Mov_16 >B_end, <B_end, #<$5f3f,  #>$5f3f
+Mov_16 B_start, B_start + 1, #<VIC_bank, #>VIC_bank
+Mov_16 B_end, B_end + 1, #<$5f3f,  #>$5f3f
 LDA #$00
 jsr memset
 
 
 ;;Sets the screen color to black and white
-Mov_16 >B_start, <B_start, #<Screen_RAM, #>Screen_RAM
-Mov_16 >B_end, <B_end, #<Screen_RAM_end, #>Screen_RAM_end
+Mov_16 B_start, B_start + 1, #<Screen_RAM, #>Screen_RAM
+Mov_16 B_end, B_end + 1, #<Screen_RAM_end, #>Screen_RAM_end
 LDA #%11110000
 jsr memset
 SEI ;Disable interups (not all)
diff --git a/wip-hugo/routines/line/line.inc b/wip-hugo/routines/line/line.inc
index b651a58..4060b9b 100644
--- a/wip-hugo/routines/line/line.inc
+++ b/wip-hugo/routines/line/line.inc
@@ -5,13 +5,13 @@
         Y_end = $F0
         dx = $F3
         dy = $F1
-        dy_2 = $F1F2
-        dx_2 = $F3F4
-        V = $EDEE
-        D = $EBEC
-        ;;These come from mem.inc
+        dy_2 = $F1          ; 16-bit value (uses F2)
+        dx_2 = $F3          ; 16-bit value (uses F4)
+        V = $ED             ; 16-bit value (uses EE)
+        D = $EB             ; 16-bit value (uses EC)
+        ;; These come from mem.inc
         ;; Takes up FF - F5
         X_pos = $FC
         Y_pos = $FB
-        byte_to_paint = $FE ;Byte with one 1 that corisponds to a pixel.
-        btp_mem_pos =$F9FA; byte to paint memory position ;Position of byte on screen
+        byte_to_paint = $FE ; Byte with one 1 that corisponds to a pixel.
+        btp_mem_pos =$F9    ; 16-bit value (uses FA), byte to paint memory position
diff --git a/wip-hugo/routines/line/line.s b/wip-hugo/routines/line/line.s
index 5b656e8..b6bde91 100644
--- a/wip-hugo/routines/line/line.s
+++ b/wip-hugo/routines/line/line.s
@@ -2,8 +2,6 @@
 
 .proc line; X_pos =< X_end skall alltid gälla
         .include "line.inc"
-       ; dx_ = $0c
-       ; dy_ = $06
         ;;dx
         SEC
         LDA X_end
diff --git a/wip-hugo/routines/line/line_down.s b/wip-hugo/routines/line/line_down.s
index e90ab7a..a924e30 100644
--- a/wip-hugo/routines/line/line_down.s
+++ b/wip-hugo/routines/line/line_down.s
@@ -14,19 +14,19 @@
 
         ;;We need to clear this memory
         LDA #$00
-        STA <V
-        STA <dy_2
+        STA V +1
+        STA dy_2 +1
         STA $FD ; for pixel_draw
 
         ;; V = 2*(dx -dy)
         SEC
         LDA dx
         SBC dy
-        STA >V
-        Mult_16 >V, <V
+        STA V
+        Mult_16 V, V +1
 
         ;dy_2 = dy*2
-        Mult_16 >dy_2, <dy_2 ;>dy_2 = dy (same address)
+        Mult_16 dy_2, dy_2 +1 ;>dy_2 = dy (same address)
 
         ;; This is an Bresenham's line algorithm, se wikipedia bellow.
         ;;https://en.wikipedia.org/wiki/Bresenham%27s_line_algorithm
@@ -39,9 +39,9 @@
         ;; and to its branch logic later in the loop.
 
         ;;D = 2*dy - dx + 2*255
-        Mov_16 >D, <D, >dy_2, <dy_2
-        Add_16 >D, <D, #$ff, #$01, !
-        Sub_16 >D, <D, dx, #$00
+        Mov_16 D, D + 1, dy_2, dy_2 +1
+        Add_16 D, D + 1, #$ff, #$01, !
+        Sub_16 D, D + 1, dx, #$00
 
 selfmod:
         ;; Self modifying code. Makes LDA and SBC instructions each take 1 cycle less.
@@ -50,17 +50,17 @@ selfmod:
         ;address that needs to be modified
         ;; dy_2
         ;; Modifies LDA >dy_2
-        LDA >dy_2
+        LDA dy_2
         STA case_2 +1
         ;; Modifies LDA <dy_2
-        LDA <dy_2
+        LDA dy_2 + 1
         STA case_2 +7
         ;; V
         ;;Modidies SBC >V
-        LDA >V
+        LDA V
         STA case_1 +1
         ;; Modifies SBC <V
-        LDA <V
+        LDA V +1
         STA case_1 +7
 end_selfmod:
         JSR pixel_draw ;;only used first pixel. after this relative position is abused
@@ -71,8 +71,8 @@ for_x:
         ;; Paints A to address in |btp_mem_pos* + Y|
         ;; Y is pixel position in the chunk. Therefor it may be that Y = 0, 1, 2, 3, 4, ,5 ,6 ,7.
         LDA byte_to_paint ;A byte containing a single 1. Coresponds to X position in the chunk.
-        ORA (>btp_mem_pos), Y
-        STA (>btp_mem_pos), Y
+        ORA (btp_mem_pos), Y
+        STA (btp_mem_pos), Y
 increment_pixel_x:
         LSR byte_to_paint ; Rotates the pixel one bit to the left ON THE SCREEN.
         BCC increment_pixel_x_end; We need to move to the next chunk
@@ -80,7 +80,7 @@ move_8px_left:
         ;; Next chunk is 8 addresses away. Look in pixel_draw for more detail.
         ;; -8.
         ;; C = 1 therefore you se 07
-        Add_16 >btp_mem_pos, <btp_mem_pos, #$07, #$00, !
+        Add_16 btp_mem_pos, btp_mem_pos +1, #$07, #$00, !
         ;; Restores byte to paint
         LDA #%10000000
         STA byte_to_paint
@@ -89,13 +89,13 @@ increment_pixel_x_end:
         BEQ end ;We keep track on when to stop line draw with the X registry.
         ;;If D <  %00000010 00000000:  case_2
         ;;else case 1.
-        Lag_16 >D, <D, #$00, #$02, case_2
+        Lag_16 D, D + 1, #$00, #$02, case_2
 case_1:
         ;; D = D - V
         ;; Because Lag_16:
         ;;      C =1 so we can use !
         ;;      A = >D
-        Sub_16_A >D, <D, #>V, #<V, !
+        Sub_16_A D, D + 1, #>V, #<V, !
 increment_y_pos:
         INY ; Increment Y pos inside the buffer
         CPY #$08
@@ -105,11 +105,11 @@ move_8px_down: ; Z=1 --> C=1
         ;; Switch to chunk bellow
         ; C = 1
         ; So we subtract  #$3F, #$01 +C
-        Add_16 >btp_mem_pos, <btp_mem_pos, #$3F, #$01, !; +320
+        Add_16 btp_mem_pos, btp_mem_pos +1, #$3F, #$01, !; +320
         JMP for_x
 increment_y_pos_end:
 case_2:
-        Add_16 >D, <D, #>dy_2, #<dy_2, ! ;D = D + 2*dy
+        Add_16 D, D + 1, #>dy_2, #<dy_2, ! ;D = D + 2*dy
         JMP for_x
 end:
         RTS
diff --git a/wip-hugo/routines/line/line_down_inv.s b/wip-hugo/routines/line/line_down_inv.s
index 4e91f71..83e5e04 100644
--- a/wip-hugo/routines/line/line_down_inv.s
+++ b/wip-hugo/routines/line/line_down_inv.s
@@ -12,65 +12,65 @@
         .include "line.inc"; Defines memory positions, ex X_pos
 
         LDA #$00
-        STA <V
-        STA <dx_2
+        STA V + 1
+        STA dx_2 + 1
         STA $FD
 
         SEC
         LDA dy
         SBC dx
-        STA >V
-        Mult_16 >V, <V
+        STA V
+        Mult_16 V, V + 1
 
-        Mult_16 >dx_2, <dx_2
+        Mult_16 dx_2, dx_2 + 1
 
-        Mov_16 >D, <D, >dx_2, <dx_2
-        Add_16 >D, <D, #$ff, #$01, !
-        Sub_16 >D, <D, dy, #$00
+        Mov_16 D, D + 1, dx_2, dx_2 + 1
+        Add_16 D, D + 1, #$ff, #$01, !
+        Sub_16 D, D + 1, dy, #$00
 
 
 selfmod:
-        LDA >dx_2
-        STA case_2 +1
-        LDA <dx_2
-        STA case_2 +7
-        LDA >V
-        STA case_1 +1
-        LDA <V
-        STA case_1 +7
+        LDA dx_2
+        STA case_2 + 1
+        LDA dx_2 + 1
+        STA case_2 + 7
+        LDA V
+        STA case_1 + 1
+        LDA V + 1
+        STA case_1 + 7
 end_selfmod:
         jsr pixel_draw
         LDY #$00
         LDX dy
 for_y:
         LDA byte_to_paint
-        ORA (>btp_mem_pos), Y
-        STA (>btp_mem_pos), Y
+        ORA (btp_mem_pos), Y
+        STA (btp_mem_pos), Y
 increment_y_pos:
         INY
         CPY #$08
         BNE increment_y_pos_end
 move_8px_down:
         LDY #$00
-        Add_16 >btp_mem_pos, <btp_mem_pos, #$3F ,#$01, !
+        Add_16 btp_mem_pos, btp_mem_pos + 1, #$3F ,#$01, !
 increment_y_pos_end:
         DEX
         ;CPX Y_end
         BEQ end
-        Lag_16 >D, <D, #$00, #$02, case_2
+        Lag_16 D, D + 1, #$00, #$02, case_2
 case_1:
-        Sub_16_A >D, <D, #>V, #<V, !
+        Sub_16_A D, D + 1, #>V, #<V, !
 increment_pixel_x:
         LDA byte_to_paint
         LSR byte_to_paint
         BCC for_y
 move_8px_left:
-        Add_16 >btp_mem_pos, <btp_mem_pos, #$07, #$00, !
+        Add_16 btp_mem_pos, btp_mem_pos + 1, #$07, #$00, !
         LDA #%10000000
         STA byte_to_paint
         JMP for_y
 case_2:
-        Add_16 >D, <D, #>dx_2, #<dx_2, ! ;D = D + 2*dx
+        Add_16 D, D + 1, #>dx_2, #<dx_2, ! ;D = D + 2*dx
         JMP for_y
 end:
         RTS
diff --git a/wip-hugo/routines/line/line_test.s b/wip-hugo/routines/line/line_test.s
index f8e0466..6ac01c2 100644
--- a/wip-hugo/routines/line/line_test.s
+++ b/wip-hugo/routines/line/line_test.s
@@ -46,13 +46,13 @@ end__:
 end:
         ;;Long lines
         ;;Lets cleer bitmap
-        B_start = $FCFD
-        B_end = $FEFF
+        B_start = $FC ;16-bit value (uses FD)
+        B_end = $FE   ;16-bit value (uses FF)
         VIC_bank = $4000
         VIC_bank_end = VIC_bank + $3FFF
         ;;Paint the bitmap black. More bitmap: https://www.c64-wiki.com/wiki/53272, https://www.c64-wiki.com/wiki/Screen_RAM#Moving_of_screen_RAM
-        Mov_16 >B_start, <B_start, #<VIC_bank, #>VIC_bank
-        Mov_16 >B_end, <B_end, #<$5f3f,  #>$5f3f
+        Mov_16 B_start, B_start + 1, #<VIC_bank, #>VIC_bank
+        Mov_16 B_end, B_end + 1, #<$5f3f,  #>$5f3f
         LDA #$00
         jsr memset
 
diff --git a/wip-hugo/routines/line/line_test_time.s b/wip-hugo/routines/line/line_test_time.s
index 7006dde..6dacd3a 100644
--- a/wip-hugo/routines/line/line_test_time.s
+++ b/wip-hugo/routines/line/line_test_time.s
@@ -33,17 +33,14 @@
         jmp @loop
 end__:
         ;;Lets cleer bitmap
-        B_start = $FCFD
-        B_end = $FEFF
+        B_start = $FCFD ;16-bit value (uses FD)
+        B_end = $FEFF   ;16-bit value (uses FF)
         VIC_bank = $4000
         VIC_bank_end = VIC_bank + $3FFF
         ;;Paint the bitmap black. More bitmap: https://www.c64-wiki.com/wiki/53272, https://www.c64-wiki.com/wiki/Screen_RAM#Moving_of_screen_RAM
-        Mov_16 >B_start, <B_start, #<VIC_bank, #>VIC_bank
-        Mov_16 >B_end, <B_end, #<$5f3f,  #>$5f3f
+        Mov_16 B_start, B_start + 1, #<VIC_bank, #>VIC_bank
+        Mov_16 B_end, B_end + 1, #<$5f3f,  #>$5f3f
         LDA #$00
         jsr memset
-
-
         jmp exit
-
 .endscope
diff --git a/wip-hugo/routines/line/line_up.s b/wip-hugo/routines/line/line_up.s
index 3296bd3..3a77f9d 100644
--- a/wip-hugo/routines/line/line_up.s
+++ b/wip-hugo/routines/line/line_up.s
@@ -14,64 +14,64 @@
         .include "line.inc"; Defines memory positions, ex X_pos
 
         LDA #$00
-        STA <V
-        STA <dy_2
+        STA V + 1
+        STA dy_2 + 1
         STA $FD
 
         SEC
         LDA dx
         SBC dy
-        STA >V
-        Mult_16 >V, <V
+        STA V
+        Mult_16 V, V + 1
 
-        Mult_16 >dy_2, <dy_2
+        Mult_16 dy_2, dy_2 + 1
 
-        Mov_16 >D, <D, >dy_2, <dy_2
-        Add_16 >D, <D, #$ff, #$01, !
-        Sub_16 >D, <D, dx, #$00
+        Mov_16 D, D + 1, dy_2, dy_2 + 1
+        Add_16 D, D + 1, #$ff, #$01, !
+        Sub_16 D, D + 1, dx, #$00
 
 selfmod:
-        LDA >dy_2
-        STA case_2 +1
-        LDA <dy_2
-        STA case_2 +7
-        LDA >V
-        STA case_1 +1
-        LDA <V
-        STA case_1 +7
+        LDA dy_2
+        STA case_2 + 1
+        LDA dy_2 + 1
+        STA case_2 + 7
+        LDA V
+        STA case_1 + 1
+        LDA V + 1
+        STA case_1 + 7
 end_selfmod:
         jsr pixel_draw
-        Sub_16 >btp_mem_pos, <btp_mem_pos, #$01, #$00 ;; Y has always a offset of at least 1
+        Sub_16 btp_mem_pos, btp_mem_pos + 1, #$01, #$00 ;; Y has always a offset of at least 1
         LDY #$01
         LDX dx
 for_x:
         LDA byte_to_paint
-        ORA (>btp_mem_pos), Y
-        STA (>btp_mem_pos), Y
+        ORA (btp_mem_pos), Y
+        STA (btp_mem_pos), Y
 increment_pixel_x:
         LSR byte_to_paint
         BCC increment_pixel_x_end
 move_8px_left:
-        Add_16 >btp_mem_pos, <btp_mem_pos, #$07, #$00,!
+        Add_16 btp_mem_pos, btp_mem_pos + 1, #$07, #$00,!
         LDA #%10000000
         STA byte_to_paint
 increment_pixel_x_end:
         DEX
         ;CPX X_end
         BEQ end
-        Lag_16 >D, <D, #$00, #$02, case_2
+        Lag_16 D, D + 1, #$00, #$02, case_2
 case_1:
-        Sub_16_A >D, <D, #>V, #<V,!
+        Sub_16_A D, D + 1, #>V, #<V,!
 decrement_y_pos:
         DEY
         BNE for_x
 move_8px_up:
         LDY #$08
-        Sub_16 >btp_mem_pos, <btp_mem_pos, #$40, #$01, !
+        Sub_16 btp_mem_pos, btp_mem_pos + 1, #$40, #$01, !
         jmp for_x
 decrement_y_pos_end:
 case_2:
-        Add_16 >D, <D, #>dy_2, #<dy_2,!
+        Add_16 D, D + 1, #>dy_2, #<dy_2,!
         JMP for_x
 end:
         RTS
diff --git a/wip-hugo/routines/line/line_up_inv.s b/wip-hugo/routines/line/line_up_inv.s
index d29a63c..cd915e9 100644
--- a/wip-hugo/routines/line/line_up_inv.s
+++ b/wip-hugo/routines/line/line_up_inv.s
@@ -13,63 +13,63 @@
         .include "line.inc"; Defines memory positions, ex X_pos
 
         LDA #$00
-        STA <V
-        STA <dx_2
+        STA V + 1
+        STA dx_2 + 1
         STA $FD
 
         SEC
         LDA dy
         SBC dx
-        STA >V
-        Mult_16 >V, <V
+        STA V
+        Mult_16 V, V + 1
 
-        Mult_16 >dx_2, <dx_2
+        Mult_16 dx_2, dx_2 + 1
 
-        Mov_16 >D, <D, >dx_2, <dx_2
-        Add_16 >D, <D, #$ff, #$01, !
-        Sub_16 >D, <D, dy, #$00
+        Mov_16 D, D + 1, dx_2, dx_2 + 1
+        Add_16 D, D + 1, #$ff, #$01, !
+        Sub_16 D, D + 1, dy, #$00
 
 selfmod:
-        LDA >dx_2
-        STA case_2 +1
-        LDA <dx_2
-        STA case_2 +7
-        LDA >V
-        STA case_1 +1
-        LDA <V
-        STA case_1 +7
+        LDA dx_2
+        STA case_2 + 1
+        LDA dx_2 + 1
+        STA case_2 + 7
+        LDA V
+        STA case_1 + 1
+        LDA V + 1
+        STA case_1 + 7
 end_selfmod:
         jsr pixel_draw
         LDY #$00
         LDX dy
 for_y:
         LDA byte_to_paint
-        ORA (>btp_mem_pos), Y
-        STA (>btp_mem_pos), Y
+        ORA (btp_mem_pos), Y
+        STA (btp_mem_pos), Y
 decrement_y_pos:
         DEY
         CPY #$ff
         BNE decrement_y_pos_end
 move_8px_up:
         LDY #$07
-        Sub_16>btp_mem_pos, <btp_mem_pos,#$40 , #$01, !
+        Sub_16 btp_mem_pos, btp_mem_pos + 1,#$40 , #$01, !
 decrement_y_pos_end:
         DEX
         BEQ end
-        Lag_16 >D, <D, #$00, #$02, case_2
+        Lag_16 D, D + 1, #$00, #$02, case_2
 case_1:
-        Sub_16_A >D, <D, #>V, #<V, !
+        Sub_16_A D, D + 1, #>V, #<V, !
 increment_pixel_x:
         LDA byte_to_paint
         LSR byte_to_paint
         BCC for_y
 move_8px_left:
-        Add_16 >btp_mem_pos, <btp_mem_pos, #$07, #$00,!
+        Add_16 btp_mem_pos, btp_mem_pos + 1, #$07, #$00,!
         LDA #%10000000
         STA byte_to_paint
         JMP for_y
 case_2:
-        Add_16 >D, <D, #>dx_2, #<dx_2, !
+        Add_16 D, D + 1, #>dx_2, #<dx_2, !
         JMP for_y
 end:
         RTS
diff --git a/wip-hugo/routines/memory/mem.inc b/wip-hugo/routines/memory/mem.inc
index 6093345..2148d71 100644
--- a/wip-hugo/routines/memory/mem.inc
+++ b/wip-hugo/routines/memory/mem.inc
@@ -1,13 +1,13 @@
 ;;; -*- Mode: asm; indent-tabs-mode: t; tab-width: 8 -*-
 
 ;;In use of in memcpy and memset
-        A_start = $FAFB
-        B_start = $FCFD
-        B_end = $FEFF
+        A_start = $FA      ; 16-bit value (uses FB)
+        B_start = $FC      ; 16-bit value (uses FD)
+        B_end = $FE        ; 16-bit value (uses FF)
 ;;In use of by pixel_draw
         Y_pos = $FB
         X_pos = $FCFD
         byte_to_paint = $FE
-        btp_mem_pos = $F9FA; byte to paint memory position
-        C = $F7F8
-        B = $F5F6
+        btp_mem_pos = $F9  ; 16-bit value (uses FA), byte to paint memory position
+        C = $F7            ; 16-bit value (uses F8)
+        B = $F5            ; 16-bit value (uses F6)
diff --git a/wip-hugo/routines/memory/memcpy.s b/wip-hugo/routines/memory/memcpy.s
index e827789..c9487e7 100644
--- a/wip-hugo/routines/memory/memcpy.s
+++ b/wip-hugo/routines/memory/memcpy.s
@@ -8,16 +8,16 @@
         ;; Let Y + A_start lower nibble represent A_start
         ;; therefor: A_start = Y - A_start
         ;; With Y we mean what Y will represent later aka >B_start
-        Sub_16 >A_start, <A_start, >B_start, #$00
+        Sub_16 A_start, A_start + 1, B_start, #$00
 
         ;;Lets move B_start lover-nibble to Y
-        LDY >B_start
+        LDY B_start
         LDA #$00
-        STA >B_start
+        STA B_start
 loop:
-        Lag_16 >B_end, <B_end, A, <B_start, end_loop
-        LDA (>B_start), Y
-        STA (>A_start), Y
+        Lag_16 B_end, B_end + 1, A, B_start, end_loop
+        LDA (B_start), Y
+        STA (A_start), Y
         ;Tip save time by counting downward, fast to check if Y ==0 // hugo
         INY
         TYA
@@ -25,8 +25,8 @@ loop:
         BNE loop
         ;; Fix overflow
         LDY #$00
-        INC <A_start
-        INC <B_start
+        INC A_start + 1
+        INC B_start + 1
         JMP loop
 end_loop:
 RTS
diff --git a/wip-hugo/routines/memory/memcpy_test.s b/wip-hugo/routines/memory/memcpy_test.s
index 38ab1f4..83e9832 100644
--- a/wip-hugo/routines/memory/memcpy_test.s
+++ b/wip-hugo/routines/memory/memcpy_test.s
@@ -3,13 +3,12 @@
 .scope memcpy_test
         charset = $FB
         code = $FE
-        petski_position = $FEFF ;reuses code:s memory
-        screen_position = $FCFD
+        petski_position = $FE ;16-bit value (uses FF), reuses code:s memory
+        screen_position = $FC ;16-bit value (uses FD)
 
-
-        Mov_16 >B_start, <B_start, #<$D000, #>$D000
+        Mov_16 B_start, B_start + 1, #<$D000, #>$D000
         ;#### TEMP INIT DATA ####
-        Mov_16 >B_end, <B_end,  #<($D000+$1F3F), #>($D000 +$1F3F)
+        Mov_16 B_end, B_end + 1,  #<($D000+$1F3F), #>($D000 +$1F3F)
         LDA #$10
         STA code
         LDA #$10
@@ -18,11 +17,9 @@
 
         VIC_bank = $4000
         VIC_bank_end = VIC_bank + $3FFF
-        Mov_16 >A_start, <A_start, #<VIC_bank, #>VIC_bank
-        ;We first need to clear some memory
-        ;Mov_16 >A_end, >A_end,  #<(VIC_bank+100),  #>(VIC_bank +100)
+        Mov_16 A_start, A_start + 1, #<VIC_bank, #>VIC_bank
         LDA #$00
         JSR memcpy
-        STA <petski_position
+        STA petski_position
         jmp exit
 .endscope
diff --git a/wip-hugo/routines/memory/memset.s b/wip-hugo/routines/memory/memset.s
index 3385260..ea9d8cd 100755
--- a/wip-hugo/routines/memory/memset.s
+++ b/wip-hugo/routines/memory/memset.s
@@ -10,22 +10,22 @@
 loop:
 	;;write to byte
 	TYA
-	STA (>B_start ,X)
+	STA (B_start ,X)
 
-	Add_16 >B_start, <B_start, #$01, #$00
+	Add_16 B_start, B_start +1, #$01, #$00
 
-	LDA >B_start
-	CMP >B_end
+	LDA B_start
+	CMP B_end
 	BEQ test
 	jmp loop
 test:
-	LDA <B_start
-	CMP <B_end
+	LDA B_start +1
+	CMP B_end +1
 	BEQ end
 	jmp loop
 end:
 	;;Dont forget to rewrite last byte
 	TYA
-	STA (>B_start, X)
+	STA (B_start, X)
 	RTS
 .endproc
diff --git a/wip-hugo/routines/memory/pixel_draw.s b/wip-hugo/routines/memory/pixel_draw.s
index 2138d70..f13020f 100755
--- a/wip-hugo/routines/memory/pixel_draw.s
+++ b/wip-hugo/routines/memory/pixel_draw.s
@@ -34,10 +34,10 @@ end__:
 	;;pos = x_offset
 	LDA #%11111000
 	AND >X_pos
-	STA >btp_mem_pos
+	STA btp_mem_pos
 
 	LDA <X_pos
-	STA <btp_mem_pos
+	STA btp_mem_pos +1
 
 	;;The y_pos adds offset because chunk offsets + inside chunk offset.
 	;; Adding inside chunk offset
@@ -51,29 +51,29 @@ end__:
 	CLC
 	LDA #%11111000 ; A =  y - [y (mod 8)]
 	AND Y_pos
-	STA >C
-	STA >B
+	STA C
+	STA B
 	LDA #$00
-	STA <C
-	STA <B
+	STA C+1
+	STA B+1
 
 	;;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+1
+	Mult_16 C, C+1
 
 	;; + _*1
-	Add_16 >C, <C, >B, <B, !
+	Add_16 C, C+1, B, B+1, !
 
 	;; *2*2*2
-	Mult_16 >C, <C
-	Mult_16 >C, <C
-	Mult_16 >C, <C
+	Mult_16 C, C + 1
+	Mult_16 C, C + 1
+	Mult_16 C, C + 1
 
-	Add_16 >btp_mem_pos, <btp_mem_pos, >C, <C, !
+	Add_16 btp_mem_pos, btp_mem_pos + 1, C, C + 1, !
 
 	;;add offset for where bitmap is
-	Add_16 >btp_mem_pos, <btp_mem_pos, #<Bitmap, #>Bitmap, !
+	Add_16 btp_mem_pos, btp_mem_pos + 1, #<Bitmap, #>Bitmap, !
 
 	;;Let draw some stuff
 	LDA byte_to_paint ;; note that both bytes are used!
diff --git a/wip-hugo/source.s b/wip-hugo/source.s
index 8650072..17e6df9 100755
--- a/wip-hugo/source.s
+++ b/wip-hugo/source.s
@@ -6,7 +6,7 @@
 .include "routines/memory/mem.inc"
 ;;Code to run
 .include "STARTUP.s"
-.include "routines/line/line_test_time.s"
+.include "routines/line/line_test.s"
 ;.include "routines/memory/memcpy_test.s"
 exit:
 jmp exit