Simplified Encryption detection

Also attempted too fix comparison of signatures
(not tested)