client name works, cleaned up allocations, etc