#1,some minor changes on nodes