Updating maven build and fixed minor but in the substitution variation.