Some fixes + small changes. The code should be working by now (yay!) or not, I didn't run tests (aww!)
MCALL is copied from somewhere else for testing purposes, we must code it