Code cleanups.  Added PIN lookup to tools.  Error handling for server si...

Let's get these latest changes in there!