Updated make.sh along with some other small changes