Neatening up - added new deviceName.

Also a backup before tinkering with the client loop