Added more options to the make script ...

and cleaned it up