Add defines, comm unit and instr.mem improvements