Improved build file, plus latest jars