oops...
merge trunk
... and more silly errors
merge trunk
merge main working branch; made opcode work by getting callback ordering right