mainly GroovyDoc and some api tweaks