diff --git a/lib/libpt/Makefile b/lib/libpt/Makefile
index 2541fbcf..494507f1 100644
--- a/lib/libpt/Makefile
+++ b/lib/libpt/Makefile
@@ -4,6 +4,6 @@ SOURCES := pt.asm
 
 include $(TOPDIR)/build/lib.mk
 
-VASMFLAGS.pt += -DMINIMAL=1 -DENABLE_SAWRECT=0
+VASMFLAGS.pt += -DMINIMAL=1 -DENABLE_SAWRECT=0 -DENABLE_VUMETER=0
 
 pt.o: pt.asm ptplayer.asm $(TOPDIR)/include/ptplayer.h
diff --git a/lib/libpt/ptplayer.asm b/lib/libpt/ptplayer.asm
index 130cb4a8..7444f5c2 100644
--- a/lib/libpt/ptplayer.asm
+++ b/lib/libpt/ptplayer.asm
@@ -566,6 +566,7 @@ mt_generate_period_table:
 ;
 ; See: https://eab.abime.net/showpost.php?p=1465997&postcount=132
 
+        rem
 mt_generate_vib_sine_table:
 	move.l	d2,-(sp)
 
@@ -594,7 +595,7 @@ mt_generate_vib_sine_table:
 	dc.w	$b400,$c500,$d400,$e000,$eb00,$f400,$fa00,$fd00
 	dc.w	$ff00,$fd00,$fa00,$f400,$eb00,$e000,$d400,$c500
 	dc.w	$b400,$a100,$8d00,$7800,$6100,$4a00,$3100,$1800
-
+        erem
 
 ;---------------------------------------------------------------------------
 
@@ -668,7 +669,9 @@ _mt_init:
 
 	;Antiriad - generator code
 	bsr	mt_generate_period_table	;Create period table
+        rem
 	bsr	mt_generate_vib_sine_table	;Create sine vibrato table
+        erem
 	;Antiriad - end
 	;Fallthrough to mt_reset
 
@@ -1556,6 +1559,14 @@ mt_checkfx:
 	move.w	fx_tab(pc,d0.w),d0
 	jmp	fx_tab(pc,d0.w)
 
+; [cahir] disabled commands
+mt_arpeggio set mt_nop                  ; 0 x y
+mt_portaup set mt_nop                   ; 1 x y
+mt_vibrato set mt_nop                   ; 4 x y
+mt_vibrvolslide set mt_nop              ; 6 x y
+mt_tremolo set mt_nop                   ; 7 x y
+mt_e_cmds set mt_nop                    ; E x y
+
 fx_tab:
 	dc.w	mt_arpeggio-fx_tab	; $0
 	dc.w	mt_portaup-fx_tab
@@ -1877,6 +1888,11 @@ checkmorefx:
 .1:	move.w	morefx_tab(pc,d5.w),d0
 	jmp	morefx_tab(pc,d0.w)
 
+; [cahir] disabled commands
+mt_posjump set mt_pernop        ; B x y
+mt_patternbrk set mt_pernop     ; D x y
+mt_e_cmds set mt_pernop         ; E x y
+
 morefx_tab:
 	dc.w	mt_pernop-morefx_tab,mt_pernop-morefx_tab,mt_pernop-morefx_tab
 	dc.w	mt_pernop-morefx_tab,mt_pernop-morefx_tab,mt_pernop-morefx_tab
@@ -1901,6 +1917,13 @@ moreblockedfx:
 	move.w	blmorefx_tab(pc,d6.w),d0
 	jmp	blmorefx_tab(pc,d0.w)
 
+; [cahir] disabled commands
+mt_arpeggio set mt_nop          ; 0 x y
+mt_fineportaup set mt_nop       ; 1 x y
+mt_posjump set mt_nop           ; B x y
+mt_patternbrk set mt_nop        ; D x y
+blocked_e_cmds set mt_nop       ; E x y
+
 blmorefx_tab:
 	dc.w	mt_nop-blmorefx_tab,mt_nop-blmorefx_tab
 	dc.w	mt_nop-blmorefx_tab,mt_nop-blmorefx_tab
@@ -1915,7 +1938,7 @@ blmorefx_tab:
 	dc.w	mt_setspeed-blmorefx_tab		; $F
 	endc	; !MINIMAL
 
-
+        rem
 mt_arpeggio:
 ; cmd 0 x y (x = first arpeggio offset, y = second arpeggio offset)
 ; d4 = xy
@@ -1982,7 +2005,7 @@ mt_fineportadn:
 	tst.b	mt_Counter(a4)
 	beq	do_porta_down
 	rts
-
+        erem
 
 mt_portadown:
 ; cmd 2 x x (add xx to period)
@@ -2053,7 +2076,7 @@ mt_toneporta_nc:
 .5:	move.w	d2,AUDPER(a5)
 .6	rts
 
-
+        rem
 mt_vibrato:
 ; cmd 4 x y (x = speed, y = amplitude)
 ; d4 = xy
@@ -2107,7 +2130,7 @@ mt_vibrato_nc:
 	; increase vibratopos by speed
 	add.b	d4,n_vibratopos(a2)
 	rts
-
+        erem
 
 mt_tonevolslide:
 ; cmd 5 x y (x = volume-up, y = volume-down)
@@ -2116,7 +2139,7 @@ mt_tonevolslide:
 	pea	mt_volumeslide(pc)
 	bra	mt_toneporta_nc
 
-
+        rem
 mt_vibrvolslide:
 ; cmd 6 x y (x = volume-up, y = volume-down)
 ; d4 = xy
@@ -2191,7 +2214,7 @@ mt_tremolo:
 	; increase tremolopos by speed
 	add.b	d4,n_tremolopos(a2)
 	rts
-
+        erem
 
 mt_volumeslide:
 ; cmd A x y (x = volume-up, y = volume-down)
@@ -2227,7 +2250,7 @@ set_vol:
 	move.w	d0,AUDVOL(a5)
 	rts
 
-
+        rem
 mt_posjump:
 ; cmd B x y (xy = new song position)
 ; d4 = xy
@@ -2240,7 +2263,7 @@ jump_pos0:
 	move.w	d7,mt_PBreakPos(a4)
 	st	mt_PosJumpFlag(a4)
 	rts
-
+        erem
 
 mt_volchange:
 ; cmd C x y (xy = new volume)
@@ -2257,7 +2280,7 @@ mt_volchange:
 	move.w	d4,AUDVOL(a5)
 	rts
 
-
+        rem
 mt_patternbrk:
 ; cmd D x y (xy = break pos in decimal)
 ; d4 = xy
@@ -2277,7 +2300,7 @@ mt_patternbrk:
 
 mult10tab:
 	dc.b	0,10,20,30,40,50,60,70,80,90,0,0,0,0,0,0
-
+        erem
 
 mt_setspeed:
 ; cmd F x y (xy<$20 new speed, xy>=$20 new tempo)
@@ -2298,7 +2321,7 @@ mt_setspeed:
 	move.b	d0,CIAB+CIATAHI
 	rts
 
-
+        rem
 mt_e_cmds:
 ; cmd E x y (x=command, y=argument)
 ; d4 = xy
@@ -2554,6 +2577,7 @@ mt_funk:
 	move.w	d0,n_funk(a2)
 	bne	mt_updatefunk
 .1:	rts
+        erem
 
 mt_updatefunk:
 ; d0 = funk speed
@@ -3140,8 +3164,10 @@ mt_TuningM1	rs.w	36
 ; Antiriad - end of periodtable
 
 ; Antiriad - vibrato sine table
+        rem
 mt_VibratoSineTable	rs.b	16*64
 mt_VibratoSineTable_End	rs.b	0
+        erem
 ; Antiriad - end of vibrato sine table
 
 mt_chan1	rs.b	n_sizeof