refs #302 some formatting corrections; renamed client.php to tenant.php