Separated the Node class. Small fixes.