Fix the encrypter to actually use AES encryption by default.
Cleaning up some code.
working on service provider.