Increase timeouts, fixed marshaling, config parser.