Various Improvements

A few changes I found while reviewing the bundle to switch the 2.0 installer over to this fork.