Setting more functions to use java collections.  Drop obsolete code.
Fixes to documentation.  This is a breaking change
Fix conflicts