Change: Fix incorrect reference to private key, cleanups

Added various lexers to console and diff output