Revert 9570511..4230b26

This rolls back to commit 95705113a33ec99c493b43b51877330b46eedf7c.
increase max number of clients, remove toUpperCase() in toString