An improved analysis for band edge optical absorption spectra in hydrogenated amorphous silicon from optical and photoconductivity measurements