Add timeouts for requests; clean up option parsing config