diff --git a/init.el b/init.el
index 2951593..ebe2f2a 100644
--- a/init.el
+++ b/init.el
@@ -75,7 +75,6 @@
 (paren-activate)     ; activating
 
 (global-set-key (kbd "C-M-<backspace>") 'backward-kill-sexp)
-(global-set-key (kbd "<backtab>") 'TeX-complete-symbol)
 
 (setq mouse-autoselect-window nil)
 (mouse-wheel-mode t)
@@ -123,16 +122,29 @@
 			     (modify-syntax-entry ?\\ "w" LaTeX-mode-syntax-table)
 			     (setq sourcepair-source-extensions '(".tex"))
 			     (setq sourcepair-header-extensions '(".p.tex"))
-			     (define-key LaTeX-mode-map (kbd "C-}") 'TeX-back-insert-braces)
-			     (define-key LaTeX-mode-map (kbd "C-{") 'TeX-insert-braces)
-			     (define-key LaTeX-mode-map (kbd "C-c C-v") (lambda (arg) (interactive "P") (insert "~") (if arg (TeX-insert-macro "eqref") (TeX-insert-macro "ref"))))
-			     (define-key LaTeX-mode-map (kbd "S-<return>") (lambda () (interactive) (LaTeX-insert-environment "align*")))
-			     (define-key LaTeX-mode-map (kbd "S-SPC") "\\")
+			     (define-key LaTeX-mode-map (kbd "C-c C-v")
+			       (lambda (arg)
+				 (interactive "P")
+				 (insert "~")
+				 (if arg (TeX-insert-macro "eqref")
+				   (TeX-insert-macro "ref"))))
+			     (define-key LaTeX-mode-map (kbd "M-S-<return>")
+			       (lambda (arg)
+				 (interactive "P")
+				 (if arg (LaTeX-insert-environment "align")
+				   (LaTeX-insert-environment "align*"))))
+
+			     (define-key LaTeX-mode-map (kbd "S-SPC") (lambda() (interactive) (insert "\\")))
 			     (define-key LaTeX-mode-map (kbd "M-S-SPC") 'TeX-insert-braces)
 			     (define-key LaTeX-mode-map (kbd "s-SPC") (lambda() (interactive) (insert "~")))
-			     (define-key LaTeX-mode-map (kbd "M-_") (lambda () (interactive) (insert "_{}") (backward-char)))
-			     (define-key LaTeX-mode-map (kbd "M-^") (lambda () (interactive) (insert "^{}") (backward-char)))
-			     (define-key LaTeX-mode-map (kbd "H-t") (lambda (arg) (interactive "P") (insert "\\todo") (if arg (insert "[inline]")) (insert "{}{}") (backward-char 3)))
+			     (define-key LaTeX-mode-map (kbd "M-_") (lambda (r-begin r-end) (interactive "r") (add-delimiter "_{" "}" r-begin r-end)))
+			     (define-key LaTeX-mode-map (kbd "M-^") (lambda (r-begin r-end) (interactive "r") (add-delimiter "^{" "}" r-begin r-end)))
+			     (define-key LaTeX-mode-map (kbd "C-c C-d")
+			       (lambda (arg r-begin r-end) (interactive "P\nr")
+				 (if arg
+				     (add-delimiter "\\todo[inline]{" "}{}" r-begin r-end)
+				   (add-delimiter "\\todo{" "}{}" r-begin r-end))))
+			     (define-key LaTeX-mode-map (kbd "C-c C-g") 'magit-status)
 			     ))
 (global-set-key (kbd "<f6>") 'sourcepair-load)
 
@@ -163,9 +175,13 @@
   (if (use-region-p)
     (progn
       (save-excursion
-      (goto-char r-end) (insert delim-end)
-      (goto-char r-begin) (insert delim-begin)))
-    (insert delim-begin delim-end)))
+	(goto-char r-end) (insert delim-end)
+	(goto-char r-begin) (insert delim-begin)))
+    (progn
+      (save-excursion
+	(insert delim-end))
+      (insert delim-begin))))
+
 
 (defun add-curlybrackets-delimiter (r-begin r-end)
   "Add a pair {} at the boundary of the current region if activated"