added most nodes, still some doubts