Added H4, p0, intensity and made directory names safer