Bugfixes, code cleanup.  vtable error has disappeared since cleaning up the codebase