improved client handling and request