Fixed minor windows installer problems
merged updates