cleaned up settings - separated client and server settings