add TODO notes around robustness & timeouts