Added dHf & S values; debugged; reorganized