Significantly clean-up the install script and cross off some TODO items