Improved the installation scripts