fixes for hanging requests and validation logic