quick updates

improve error handling/reporting
implement dynamic timeout handling