diff --git a/init.el b/init.el
index ba9f361..81e370e 100644
--- a/init.el
+++ b/init.el
@@ -106,29 +106,36 @@
 ;; create the autosave dir if necessary, since emacs won't.
 (make-directory "~/.emacs.d/autosaves/" t)
 (make-directory "~/.emacs.d/backup/" t)
+(require 'linum)
+
 
-(add-hook 'LaTeX-mode-hook 'turn-on-auto-fill)
 (add-hook 'text-mode-hook 'flyspell-mode)
-(require 'linum)
-(add-hook 'LaTeX-mode-hook 'linum-mode)
-;; Let us see how it goes with this.
-(add-hook 'LaTeX-mode-hook 'subword-mode)
-(add-hook 'LaTeX-mode-hook (lambda () (modify-syntax-entry ?\\ "w" LaTeX-mode-syntax-table)))
+(add-hook 'text-mode-hook 'linum-mode)
 
 (require 'sourcepair)
 (add-hook 'LaTeX-mode-hook (lambda ()
+			     (turn-on-auto-fill)
+			     (subword-mode)
+			     (setq subword-forward-regexp "\\W*\\(\\([\\\\[:upper:]]*\\W?\\)[[:lower:][:digit:]]*\\)")
+			     (setq subword-backward-regexp "\\(\\(\\W\\|[[:lower:][:digit:]]\\)\\([\\\\[:upper:]]+\\W*\\)\\|\\W\\w+\\)")
+			     (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 "\\") (lambda () (interactive) (insert ";")))
-			     ;; (define-key LaTeX-mode-map (kbd ";") (lambda () (interactive) (insert "\\")))
-			     (define-key LaTeX-mode-map (kbd "C-c }") 'TeX-back-insert-braces)
+			     (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 "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)))
 			     ))
-(setq subword-forward-regexp "\\W*\\(\\([\\\\[:upper:]]*\\W?\\)[[:lower:][:digit:]]*\\)")
-(setq subword-backward-regexp "\\(\\(\\W\\|[[:lower:][:digit:]]\\)\\([\\\\[:upper:]]+\\W*\\)\\|\\W\\w+\\)")
 (global-set-key (kbd "<f6>") 'sourcepair-load)
 
 ;; Well this is really useful for LaTeX only, but then it gets in the way when I use the minibuffer.
-(global-set-key (kbd "S-SPC") "\\")
+;;(global-set-key (kbd "S-SPC") "\\")
 
 ;; this should really be called in the hook