Fixed CSVNode; Minor updates to the rest