Improved make script, neater output and wrapper files
Improved make script, neater output and wrapper files