Fixes header recognition, touches up Encrypt interface.