addressed changes suggested by NIST

@biometrics/isi @biometrics/str @biometrics/sri @biometrics/umd will summarize proposed changes on mailing list.

@sklum @bhklein please review.