move children from HashSet to LinkedHashSet, minor fixes