Bug with the name of text nodes fixed
Some minor changes