diff --git a/loop.c b/loop.c
index 644593d..9954b3d 100644
--- a/loop.c
+++ b/loop.c
@@ -477,7 +477,9 @@ void init_loop (void) {
   } else {
     read_auth_file ();
   }
+  printf("update prompt()\n");
   update_prompt ();
+  printf("update prompt() done... \n");
 
   assert (DC_list[dc_working_num]);
   if (!DC_working || !DC_working->auth_key_id) {
@@ -494,7 +496,9 @@ void init_loop (void) {
     logprintf ("Requesting info about DC...\n");
   }
   do_help_get_config ();
+  printf("net_loop\n");
   net_loop (0, mcs);
+  printf("net_loop done...\n");
   if (verbosity) {
     logprintf ("DC_info: %d new DC got\n", new_dc_num);
   }
@@ -507,27 +511,41 @@ void init_loop (void) {
 }
 
 int start_loop (char* code, char* auth_mode) {
+  printf("Calling start_loop()\n");
+  printf("auth_state %i\n", auth_state);
   if (auth_state == 100 || !(DC_working->has_auth)) {
+    printf("auth_state == 100 || !(DC_working->has_auth)");
     int res = do_auth_check_phone (default_username);
     assert (res >= 0);
     logprintf ("%s\n", res > 0 ? "phone registered" : "phone not registered");
     if (res > 0 && !register_mode) {
       // Register Mode 1
+	  printf ("Register Mode 1\n");
       if (code) {
         if (do_send_code_result (code) >= 0) {
           printf ("Authentication successfull, state = 300\n");
           auth_state = 300;
         }
       } else {
+	      printf("No code given, attempting to register\n");
           // Send Code
-          if (strcmp(TELEGRAM_AUTH_MODE_SMS, auth_mode)) {
+		  printf ("auth mode %s\n", auth_mode);
+		  /*
+          if (strcmp(TELEGRAM_AUTH_MODE_SMS"sms", auth_mode)) {
+		  */
               do_send_code (default_username);
               printf ("Code from sms (if you did not receive an SMS and want to be called, type \"call\"): ");
+			  printf("storing current state in auth file...\n");
+    		  write_auth_file ();
+			  printf("exitting...\n");
+			  return 0;
+			  /*
           } else {
               printf ("You typed \"call\", switching to phone system.\n");
               do_phone_call (default_username);
               printf ("Calling you!");
           }
+		  */
       }
     } else {
       printf ("User is not registered. Do you want to register? [Y/n] ");
@@ -575,6 +593,7 @@ int start_loop (char* code, char* auth_mode) {
 	  */
     }
   }
+  printf("Authentication done\n");
 
   int i;
   for (i = 0; i <= MAX_DC_NUM; i++) if (DC_list[i] && !DC_list[i]->has_auth) {
diff --git a/main.c b/main.c
index a8aa8e8..cc73045 100644
--- a/main.c
+++ b/main.c
@@ -57,6 +57,10 @@
 #  include "lua-tg.h"
 #endif
 
+// TODO: Delete this shit
+#include <signal.h>
+#define BREAK raise(SIGINT);
+
 #define PROGNAME "telegram-client"
 #define VERSION "0.01"
 
@@ -515,7 +519,8 @@ int tg_login (char *username, char *code, char *auth_mode) {
       lua_init (lua_file);
     }
     #endif
-
+    
+	BREAK
     loop_auto(username, code, auth_mode);
     return 0;
 }
diff --git a/purple-plugin/Makefile b/purple-plugin/Makefile
index 5edef35..a450ff2 100755
--- a/purple-plugin/Makefile
+++ b/purple-plugin/Makefile
@@ -43,15 +43,18 @@ LDFLAGS =  $(ARCHFLAGS) -shared
 	$(CC) -c $(INCLUDE) $(CFLAGS) -o $@ $<
 
 $(LIBNAME): $(C_OBJS)
+	cd ..; make objects; cd ./purple-plugin;
 	$(LD) $(LDFLAGS) $(INCLUDE) $(LIBS_PURPLE) $(EXTRA_LIBS) -o $@ $^ $(OBJECTSTG)
 
 .PHONY: strip
 strip: $(LIBNAME)
 	$(STRIP) --strip-unneeded $(LIBNAME)
 
-.PHONY: debug
+.PHONY: debug install
 debug: CFLAGS += -g -DDEBUG
 debug: $(LIBNAME)
+	gdb -tui pidgin
+
 
 PLUGIN_DIR_PURPLE:=$(shell pkg-config --variable=plugindir purple)
 DATA_ROOT_DIR_PURPLE:=$(shell pkg-config --variable=datarootdir purple)
diff --git a/purple-plugin/telegram-purple.c b/purple-plugin/telegram-purple.c
index 31f5db6..fb5157f 100644
--- a/purple-plugin/telegram-purple.c
+++ b/purple-plugin/telegram-purple.c
@@ -90,25 +90,27 @@ static void tgprpl_login(PurpleAccount * acct)
     printf("username: %s\n", username);
     printf("code: %s\n", code);
     printf("hostname: %s\n", hostname);
-	
+
 	// TODO: Do proper input validation
+    /*
     if (code && strcmp(code, "")) {
 	  code = NULL;
 	}
-
-// You should receive a SMS with a code soon, please copy that code into the account option 'Verification Key'.
+    */
     if (!code) {
-			purple_notify_message(
-				_telegram_protocol,
-				PURPLE_NOTIFY_MSG_INFO,
-				"Telegram Verification",
-				"Telegram needs to verify this phone number. ",
-				NULL,
-				NULL,
-				NULL
-			);
+		purple_notify_message(
+			_telegram_protocol,
+			PURPLE_NOTIFY_MSG_INFO,
+			"Telegram Verification",
+			"Telegram needs to verify this phone number. You should receive a SMS with a code soon, please copy that code into the account option 'Verification Key'.",
+			NULL,
+			NULL,
+			NULL
+		);
 	}
     tg_login(username, code, TELEGRAM_AUTH_MODE_SMS);
+	printf("Returned from tg_login...\n");
+
     /*
     PurpleConnection *gc = purple_account_get_connection(acct);
     purple_debug_info(PLUGIN_ID, "logging in %s\n", username);