Embedded lock in history struct and fixed default --identity key location

Now the user won't know what the default is if they type --help. :/