Undid previous change since installer bug is still happening
Fixing some bugs that caused the installer to not work