Antlr4.2 added to class path
Small changes overall