Add client timeouts; fix tab spacing