1) proper use of new nodecomposition option;
2) bug fix on variable list;