master Fixed a number of issues with install