Installer improvements branch

A pull request with a number of installer improvements.