wip: back to pvm -> fix all compile errors