Fixed the installation significantly