diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs
index 841926d9..8e47bdeb 100644
--- a/EDMarketConnector.wxs
+++ b/EDMarketConnector.wxs
@@ -11,9 +11,10 @@
 			 Version="$(var.PRODUCTVERSION)"
 			 UpgradeCode="$(var.UPGRADECODE)"
 			 Language="!(bind.fileLanguage.EDMarketConnector.exe)"
-			 Manufacturer="Marginal">
+			 Manufacturer="EDCD">
 
 		<Package Id="*" Keywords="Installer"
+				 InstallScope="perMachine"
 				 Description="$(var.PRODUCTLONGNAME) installer"
 				 InstallerVersion="300" Compressed="yes"
 				 Platform="x86"
@@ -32,7 +33,7 @@
 		<!-- For Add/Remove programs -->
 		<Property Id="ARPPRODUCTICON" Value="EDMarketConnector.exe" />
 		<Property Id="ARPNOMODIFY" Value="yes" Secure="yes" />	<!-- Remove modify - also set by WixUI_Minimal -->
-		<Property Id="ARPHELPLINK" Value="https://github.com/Marginal/EDMarketConnector/wiki" />
+		<Property Id="ARPHELPLINK" Value="https://github.com/EDCD/EDMarketConnector/wiki" />
 
 		<!-- Set INSTALLDIR from ARPINSTALLLOCATION if replacing/upgrading -->
 		<!-- https://wyrdfish.wordpress.com/2012/07/20/msi-writing-guidelines-this-may-be-out-of-date/ -->
@@ -64,14 +65,6 @@
 			</Custom>
 		</InstallExecuteSequence>
 
-		<!-- Merge in C runtime -->
-		<DirectoryRef Id="TARGETDIR">
-			<Merge Id="VCRedist90" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC90_CRT_x86.msm" DiskId="1" Language="0"/>
-		</DirectoryRef>
-		<Feature Id="VCRedist90" Title="Visual C++ 9.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
-			<MergeRef Id="VCRedist90"/>
-		</Feature>
-
 		<!-- Launch app after upgrade -->
 		<Property Id="LAUNCH" Value="yes" />
 		<CustomAction Id="DoLaunch"
diff --git a/setup.py b/setup.py
index 3bbb318c..b40634bc 100755
--- a/setup.py
+++ b/setup.py
@@ -43,8 +43,8 @@ if dist_dir and len(dist_dir)>1 and isdir(dist_dir):
 macdeveloperid = None
 
 # Windows paths
-WIXPATH = r'C:\Program Files (x86)\WiX Toolset v3.9\bin'
-SDKPATH = r'C:\Program Files (x86)\Windows Kits\8.1\bin\x86'
+WIXPATH = r'C:\Program Files (x86)\WiX Toolset v3.11\bin'
+SDKPATH = r'C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x86'
 
 # OSX paths
 SPARKLE = '/Library/Frameworks/Sparkle.framework'
@@ -95,7 +95,7 @@ if sys.platform=='darwin':
                       ],
                       'LSMinimumSystemVersion': '10.10',
                       'NSAppleScriptEnabled': True,
-                      'NSHumanReadableCopyright': u'© 2015-2019 Jonathan Harris',
+                      'NSHumanReadableCopyright': u'© 2015-2019 Jonathan Harris, 2020 Athanasius',
                       'SUEnableAutomaticChecks': True,
                       'SUShowReleaseNotes': True,
                       'SUAllowsAutomaticUpdates': False,
@@ -147,16 +147,16 @@ setup(
     windows = [ {'dest_base': APPNAME,
                  'script': APP,
                  'icon_resources': [(0, '%s.ico' % APPNAME)],
-                 'copyright': u'© 2015-2019 Jonathan Harris',
+                 'copyright': u'© 2015-2019 Jonathan Harris, 2020 Athanasius',
                  'name': APPNAME,		# WinSparkle
-                 'company_name': 'Marginal',	# WinSparkle
+                 'company_name': 'EDCD',	# WinSparkle
                  'other_resources': [(24, 1, open(APPNAME+'.manifest').read())],
              } ],
     console = [ {'dest_base': APPCMDNAME,
                  'script': APPCMD,
-                 'copyright': u'© 2015-2019 Jonathan Harris',
+                 'copyright': u'© 2015-2019 Jonathan Harris, 2020 Athanasius',
                  'name': APPNAME,
-                 'company_name': 'Marginal',
+                 'company_name': 'EDCD',
              } ],
     data_files = DATA_FILES,
     options = OPTIONS,
@@ -213,7 +213,7 @@ appcast.write('''
 \t\t\t\t]]>
 \t\t\t</description>
 \t\t\t<enclosure
-\t\t\t\turl="https://github.com/Marginal/EDMarketConnector/releases/download/rel-{1}/{2}"
+\t\t\t\turl="https://github.com/EDCD/EDMarketConnector/releases/download/rel-{1}/{2}"
 \t\t\t\tsparkle:os="{3}"
 \t\t\t\tsparkle:version="{4}"
 \t\t\t\tlength="{5}"