diff --git a/rtl/serv_ctrl.v b/rtl/serv_ctrl.v
index 0f483ab..b0bb9c9 100644
--- a/rtl/serv_ctrl.v
+++ b/rtl/serv_ctrl.v
@@ -30,7 +30,7 @@ module serv_ctrl
 
    wire       pc_plus_4;
    wire       pc_plus_offset;
-
+   wire       pc_plus_offset_aligned;
    wire       plus_4;
 
    wire       pc;
@@ -83,7 +83,7 @@ module serv_ctrl
       .q   (pc_plus_offset),
       .o_v ());
 
-   wire       pc_plus_offset_aligned = pc_plus_offset & en_pc_r;
+   assign pc_plus_offset_aligned = pc_plus_offset & en_pc_r;
 
    assign o_ibus_cyc = en_pc_r & !i_pc_en;
 
diff --git a/rtl/serv_decode.v b/rtl/serv_decode.v
index 7f1c428..5d95fd9 100644
--- a/rtl/serv_decode.v
+++ b/rtl/serv_decode.v
@@ -77,6 +77,7 @@ module serv_decode
 
    reg [4:0] cnt;
    reg 	cnt_done;
+   wire cnt_en;
 
    reg [4:0] opcode;
    reg [31:0] imm;
@@ -150,6 +151,8 @@ module serv_decode
     343 1_011 mtval
     344 1_100 mip CWi
     */
+   wire csr_en = opcode[4] & opcode[2] & (|o_funct3) & running;
+
    assign o_csr_mstatus_en = csr_en & !op26 & !op22;
    assign o_csr_mie_en     = csr_en & !op26 &  op22 & !op20;
    assign o_csr_mtvec_en = ((!op26 & op20 & opcode[4] & opcode[2]) & state[1]) | (state == TRAP);
@@ -159,7 +162,6 @@ module serv_decode
    assign o_csr_mtval_en    = csr_en                &  op21 &  op20;
    assign o_csr_mip_en      = csr_en & op26 & op22;
 
-   wire csr_en = opcode[4] & opcode[2] & (|o_funct3) & running;
 
 
    always @(o_funct3, o_rf_rs1_addr, o_ctrl_trap, o_ctrl_mret) begin
@@ -205,6 +207,19 @@ module serv_decode
 
    assign o_alu_bool_op = o_funct3[1:0];
 
+   wire sign_bit = i_wb_rdt[31];
+
+   wire [4:0] op_code = i_wb_rdt[6:2];
+
+   wire btype = op_code[4] & !op_code[2] & !op_code[0];
+   wire itype = (!op_code[3] & !op_code[0]) | (!op_code[2]&!op_code[1]&op_code[0]) | (!op_code[0]&op_code[2]);
+   wire jtype = op_code[1];
+   wire stype = op_code[3] & ~op_code[2] & ~op_code[4];
+   wire utype = !op_code[4] & op_code[0];
+
+   wire iorjtype = (op_code[0] & ~op_code[2]) | (op_code[2] & ~op_code[0]) | (~op_code[0] & ~op_code[3]);
+   wire sorbtype = op_code[3:0] == 4'b1000;
+
    always @(posedge clk) begin
       casez(o_funct3)
         3'b000  : o_alu_rd_sel <= ALU_RESULT_ADD;
@@ -246,17 +261,6 @@ module serv_decode
 	imm <= {imm[0], imm[31:1]};
    end
 
-   wire [4:0] op_code = i_wb_rdt[6:2];
-
-   wire btype = op_code[4] & !op_code[2] & !op_code[0];
-   wire itype = (!op_code[3] & !op_code[0]) | (!op_code[2]&!op_code[1]&op_code[0]) | (!op_code[0]&op_code[2]);
-   wire jtype = op_code[1];
-   wire stype = op_code[3] & ~op_code[2] & ~op_code[4];
-   wire utype = !op_code[4] & op_code[0];
-
-   wire iorjtype = (op_code[0] & ~op_code[2]) | (op_code[2] & ~op_code[0]) | (~op_code[0] & ~op_code[3]);
-   wire sorbtype = op_code[3:0] == 4'b1000;
-   wire sign_bit = i_wb_rdt[31];
 
    assign o_imm = imm[0];
 
@@ -267,7 +271,7 @@ module serv_decode
    assign o_rd_alu_en  = !opcode[0] & opcode[2] & !opcode[4];
    assign o_rd_mem_en =              !opcode[2] & !opcode[4];
 
-   wire cnt_en = (state != IDLE);
+   assign cnt_en = (state != IDLE);
 
    assign running = (state == RUN);
 
@@ -281,7 +285,6 @@ module serv_decode
 	o_csr_mcause <= {!op20,3'b011};
    end
 
-   assign o_rf_rs_en = two_stage_op ? (state == INIT) : o_ctrl_pc_en;
 
    //slt*, branch/jump, shift, load/store
    wire two_stage_op =
@@ -292,6 +295,8 @@ module serv_decode
    reg 	mtip_r;
    reg 	pending_irq;
 
+   assign o_rf_rs_en = two_stage_op ? (state == INIT) : o_ctrl_pc_en;
+
    always @(posedge clk) begin
       if (state == INIT)
 	o_ctrl_jump <= take_branch;
diff --git a/rtl/serv_mem_if.v b/rtl/serv_mem_if.v
index 0452bb1..9e26f90 100644
--- a/rtl/serv_mem_if.v
+++ b/rtl/serv_mem_if.v
@@ -34,20 +34,23 @@ module serv_mem_if
    wire 	 dat1_en;
    wire 	 dat2_en;
    wire 	 dat3_en;
+   reg [1:0] 	 bytepos;
+
+   wire [1:0] dat_sel = i_bytecnt[1] ? i_bytecnt : (i_bytecnt | bytepos);
 
    wire 	 dat_cur = (dat_sel == 3) ? dat3[0] :
 		 (dat_sel == 2) ? dat2[0] :
 		 (dat_sel == 1) ? dat1[0] : dat0[0];
 
    wire is_signed = ~i_funct3[2];
-   assign o_rd = dat_valid ? dat_cur : signbit & is_signed;
-
-   wire dat_valid = is_word | (i_bytecnt == 2'b00) | (is_half & !i_bytecnt[1]);
-
    wire is_word = i_funct3[1];
    wire is_half = i_funct3[0];
    wire is_byte = !(|i_funct3[1:0]);
 
+   wire dat_valid = is_word | (i_bytecnt == 2'b00) | (is_half & !i_bytecnt[1]);
+   assign o_rd = dat_valid ? dat_cur : signbit & is_signed;
+
+
    wire       upper_half = bytepos[1];
 /*
    assign o_wb_sel = (is_word ? 4'b1111 :
@@ -60,7 +63,6 @@ module serv_mem_if
    assign o_wb_sel[0] = (bytepos == 2'b00);
 
    assign o_wb_we = i_cmd;
-   reg [1:0] bytepos;
 
 
    wire       wbyte0 = (i_bytecnt == 2'b00);
@@ -75,8 +77,6 @@ module serv_mem_if
 
    assign o_wb_dat = {dat3,dat2,dat1,dat0};
 
-   wire [1:0] dat_sel = i_bytecnt[1] ? i_bytecnt : (i_bytecnt | bytepos);
-
    always @(posedge i_clk) begin
       if (i_init)
 	bytepos <= i_lsb;
diff --git a/rtl/serv_mpram.v b/rtl/serv_mpram.v
index c2b4b9c..4db5bdf 100644
--- a/rtl/serv_mpram.v
+++ b/rtl/serv_mpram.v
@@ -46,6 +46,7 @@ module serv_mpram
 
    reg [3:0] 	     wcnt_lo;
    reg [2:0] 	     wcnt_hi;
+   reg 		     wgo_r;
 
    assign wdata = wcnt_lo[0] ? wdata0[3:0] :
 		  wcnt_lo[1] ? wdata1[3:0] :
@@ -67,7 +68,6 @@ module serv_mpram
 
    wire 	     wgo = !(|wcnt_lo) & |({i_rd_wen,csr_en,i_mtval_wen,i_mepc_wen});
 
-   reg 		     wgo_r;
 
    always @(posedge i_clk) begin
       if (wgo) begin