mcode: working somehow
mcode: multiple fixes