Java ReferenceContainer fixes; variables grouping UI..