Improving the buildscript, still a lot to do