prepare propoer haddocks and remove leading _s from pbkdf{1,2} functions