Fixed installation
Minor setup adjustments