Rename some things, add logging, deal with multiple clients
Fixups
Tools