Minor changes / additions

Still thinking a lot about the architecture of the VM.