trivial ws
support ANTLR plugin
cleanups
complete refactoring of #520