Various Improvements

Changes made in prep for switching 2.0 installer over to this fork