Implement timeouts, 'core.delegate', clean up comment style