Trying to make some improvements to installation procedure.