Renamed client to connection.
Moved name used in INIT out of options and into data.
Other cleanup.