Fixed timing bugs and formatting
Fixed bugs concerning nfhpcurve and new data node structures