Fixing some bugs and creating a new type of node