diff --git a/Makefile b/Makefile
index 74a6175c0..3821d9aab 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ incdir = ./includes
 test_case = alu_test
 # QuestaSim Version
 questa_version = -10.5c
-compile_flag = +cover=bcfst+/dut
+compile_flag = +cover=bcfst+/dut -lint
 
 # Iterate over all include directories and write them with +incdir+ prefixed
 # +incdir+ works for Verilator and QuestaSim
diff --git a/tb/wave/wave_lsu.do b/tb/wave/wave_lsu.do
index 75733bb98..816d32253 100644
--- a/tb/wave/wave_lsu.do
+++ b/tb/wave/wave_lsu.do
@@ -53,8 +53,8 @@ add wave -noupdate -expand -group LSU /lsu_tb/dut/translation_req
 add wave -noupdate -expand -group LSU /lsu_tb/dut/translation_valid
 add wave -noupdate -expand -group LSU /lsu_tb/dut/paddr_o
 add wave -noupdate -expand -group LSU /lsu_tb/dut/address_i
-add wave -noupdate -expand -group LSU /lsu_tb/dut/data_wdata_i
-add wave -noupdate -expand -group LSU /lsu_tb/dut/data_req_i
+add wave -noupdate -expand -group LSU -expand /lsu_tb/dut/data_wdata_i
+add wave -noupdate -expand -group LSU -expand /lsu_tb/dut/data_req_i
 add wave -noupdate -expand -group LSU /lsu_tb/dut/data_we_i
 add wave -noupdate -expand -group LSU /lsu_tb/dut/data_be_i
 add wave -noupdate -expand -group LSU /lsu_tb/dut/data_gnt_o
@@ -67,32 +67,32 @@ add wave -noupdate -expand -group LSU /lsu_tb/dut/rdata_d_ext
 add wave -noupdate -expand -group LSU /lsu_tb/dut/rdata_w_ext
 add wave -noupdate -expand -group LSU /lsu_tb/dut/rdata_h_ext
 add wave -noupdate -expand -group LSU /lsu_tb/dut/rdata_b_ext
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/clk_i
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/rst_ni
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/flush_ready_o
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/address_o
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_wdata_o
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_req_o
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_we_o
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_be_o
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_gnt_i
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_rvalid_i
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_rdata_i
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/address_i
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_wdata_i
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_req_i
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_we_i
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_be_i
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_gnt_o
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_rvalid_o
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_rdata_o
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/full_o
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/empty_o
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_i
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/push_i
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_o
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/pop_i
-add wave -noupdate -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/single_element_o
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/clk_i
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/rst_ni
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/flush_ready_o
+add wave -noupdate -expand -group mem_arbiter -expand -group Master /lsu_tb/dut/mem_arbiter_i/address_o
+add wave -noupdate -expand -group mem_arbiter -expand -group Master /lsu_tb/dut/mem_arbiter_i/data_wdata_o
+add wave -noupdate -expand -group mem_arbiter -expand -group Master /lsu_tb/dut/mem_arbiter_i/data_req_o
+add wave -noupdate -expand -group mem_arbiter -expand -group Master /lsu_tb/dut/mem_arbiter_i/data_we_o
+add wave -noupdate -expand -group mem_arbiter -expand -group Master /lsu_tb/dut/mem_arbiter_i/data_be_o
+add wave -noupdate -expand -group mem_arbiter -expand -group Master /lsu_tb/dut/mem_arbiter_i/data_gnt_i
+add wave -noupdate -expand -group mem_arbiter -expand -group Master /lsu_tb/dut/mem_arbiter_i/data_rvalid_i
+add wave -noupdate -expand -group mem_arbiter -expand -group Master /lsu_tb/dut/mem_arbiter_i/data_rdata_i
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/address_i
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_wdata_i
+add wave -noupdate -expand -group mem_arbiter -expand /lsu_tb/dut/mem_arbiter_i/data_req_i
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_we_i
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_be_i
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_gnt_o
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_rvalid_o
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_rdata_o
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/full_o
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/empty_o
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_i
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/push_i
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/data_o
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/pop_i
+add wave -noupdate -expand -group mem_arbiter /lsu_tb/dut/mem_arbiter_i/single_element_o
 add wave -noupdate -group store_queue /lsu_tb/dut/store_queue_i/clk_i
 add wave -noupdate -group store_queue /lsu_tb/dut/store_queue_i/rst_ni
 add wave -noupdate -group store_queue /lsu_tb/dut/store_queue_i/flush_i
@@ -149,8 +149,6 @@ add wave -noupdate -group mmu /lsu_tb/dut/i_mmu/update_asid
 add wave -noupdate -group mmu /lsu_tb/dut/i_mmu/update_content
 add wave -noupdate -group mmu /lsu_tb/dut/i_mmu/itlb_update
 add wave -noupdate -group mmu /lsu_tb/dut/i_mmu/itlb_lu_access
-add wave -noupdate -group mmu /lsu_tb/dut/i_mmu/lu_asid_i
-add wave -noupdate -group mmu /lsu_tb/dut/i_mmu/lu_vaddr_i
 add wave -noupdate -group mmu /lsu_tb/dut/i_mmu/itlb_content
 add wave -noupdate -group mmu /lsu_tb/dut/i_mmu/itlb_is_2M
 add wave -noupdate -group mmu /lsu_tb/dut/i_mmu/itlb_is_1G
@@ -161,12 +159,54 @@ add wave -noupdate -group mmu /lsu_tb/dut/i_mmu/dtlb_content
 add wave -noupdate -group mmu /lsu_tb/dut/i_mmu/dtlb_is_2M
 add wave -noupdate -group mmu /lsu_tb/dut/i_mmu/dtlb_is_1G
 add wave -noupdate -group mmu /lsu_tb/dut/i_mmu/dtlb_lu_hit
-add wave -noupdate -group mmu /lsu_tb/dut/i_mmu/itlb_update_i
-add wave -noupdate -group mmu /lsu_tb/dut/i_mmu/dtlb_lu_hi
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/clk_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/rst_ni
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/flush_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/ptw_active_o
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/walking_instr_o
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/ptw_error_o
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/enable_translation_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/address_o
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/data_wdata_o
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/data_req_o
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/data_we_o
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/data_be_o
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/data_gnt_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/data_rvalid_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/data_rdata_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/itlb_update_o
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/dtlb_update_o
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/update_content_o
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/update_is_2M_o
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/update_is_1G_o
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/update_vpn_o
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/update_asid_o
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/asid_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/itlb_access_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/itlb_miss_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/itlb_vaddr_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/dtlb_access_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/dtlb_miss_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/dtlb_vaddr_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/pd_ppn_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/flag_mxr_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/ptw_pte_i
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/ptw_state_q
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/ptw_state_n
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/ptw_lvl_q
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/ptw_lvl_n
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/is_instr_ptw_q
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/is_instr_ptw_n
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/tlb_update_asid_q
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/tlb_update_asid_n
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/tlb_update_vpn_q
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/tlb_update_vpn_n
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/ptw_pptr_q
+add wave -noupdate -group PTW /lsu_tb/dut/i_mmu/ptw_i/ptw_pptr_n
 TreeUpdate [SetDefaultTree]
-WaveRestoreCursors {{Cursor 1} {0 ns} 0}
-quietly wave cursor active 0
-configure wave -namecolwidth 150
+WaveRestoreCursors {{Cursor 1} {454 ns} 0}
+quietly wave cursor active 1
+configure wave -namecolwidth 176
 configure wave -valuecolwidth 100
 configure wave -justifyvalue left
 configure wave -signalnamewidth 1
@@ -180,4 +220,4 @@ configure wave -griddelta 40
 configure wave -timeline 0
 configure wave -timelineunits ns
 update
-WaveRestoreZoom {0 ns} {22042 ns}
+WaveRestoreZoom {0 ns} {1260 ns}