Minor changes.
Added some VM code... does not build yet.