Add the commons-lang JAR.
Fix to use the StringEscapeUtils3 APIs
Some code formatting cleanup.