More bug correction and added field to the nodes, so we can store methods names, etc