Added HMF, made other small corrections