Hdf5 temporary fix

Couldn't help but clean up some doc comments too.  Sorry.  And it's more like a 4-line fix.