minor improvements, still no decision on connector vs. nested nodes