Finished installation script & some small changes