Removed old nodes and added a new one

Also some other minor changes