changed setting of options, added validation for client options