Add UUID to /whois

Also some light cleanup.