removed pbkdf2 from argument names, minor cleanups