diff --git a/asterisk/conf/extensions.conf b/asterisk/conf/extensions.conf
index d43cab9..ffbb533 100644
--- a/asterisk/conf/extensions.conf
+++ b/asterisk/conf/extensions.conf
@@ -12,8 +12,7 @@ exten => s,1,Verbose(1, "INFO ${CALLERID(num)} was passed to default.")
 
 exten => s-info,1,PlayTones(info)
  same => n,Playback(hangup-try-again)
- same => n,PlayTones(info)
- same => n,Playback(hangup-try-again)
+ same => n,Wait(1)
  same => n,Playback(hangup-try-again)
 
 [globals]
@@ -64,18 +63,20 @@ exten => 1471,1,Verbose(1, "${CALLERID(num)} dialed app-lastcallreturn.")
  same => n,Wait(1)
  same => n,Playback(to-call-num-press)
  same => n,Playback(digits/1)
+ same => n,Wait(60)
+ same => n,Hangup(3)
 
 exten => 1,1,Goto(outbound-one,${number},1)
+ same => n,Hangup()
 
 exten => s-nonum,1,Playback(unidentified-no-callback)
- same => n,Hangup()
+ same => n,Hangup(3)
 
 [app-vm]
 exten = 1571,1,Verbose(1, "${CALLERID(num)} dialed the voicemail feature.")
  same = n,VoiceMailMain(${CALLERID(num)}@default,s)
  same = n,Hangup()
 
-
 [from-ext]
 
 exten => 123,1,Goto(default,s,1)
@@ -87,13 +88,13 @@ exten => 1471,1,Goto(app-lastcallreturn,${EXTEN},1)
 exten => 1571,1,Goto(app-vm,${EXTEN},1)
  same => n,Hangup()
 
-exten => _X.,1,Goto(outbound-one,${EXTEN},1)
+exten => _XX.,1,Goto(outbound-one,${EXTEN},1)
  same => n,GotoIf($["${DIALSTATUS}"="CONGESTION"]?outbound-two,${EXTEN},1)
  same => n,GotoIf($["${DIALSTATUS}"="CHANUNAVAIL"]?outbound-two,${EXTEN},1)
  same => n,Hangup()
 
 [to-ext]
-exten => _X.,1,Set(DB(lastcaller/${ARG1})=${CALLERID(num)})
+exten => s,1,Set(DB(lastcaller/${EXTEN})=${CALLERID(num)})
  same => n,Dial(PJSIP/${EXTEN})
  same => n,Hangup()