made some changes to make it so later it is easier to write an install script