Fix NRE.
Work on new VSIX installer.
Fix indentation.
Fix references.