fix bug where we were not clearing the onConnected queue, also fix a bug where we werent calling back on timeout