All working again.
CBC encryption working again.
Cleanups.