VJr license update, misc refactoring