add node structure
More little things