added encryption, removed pbkdf2

fully working