added TODO item
fixed duplicate node bug