diff --git a/commonsh/10_alias b/commonsh/10_alias
index 65aa0542..cd7cca4f 100755
--- a/commonsh/10_alias
+++ b/commonsh/10_alias
@@ -19,8 +19,9 @@ for dircolors in gdircolors dircolors ; do
 	fi
 done
 
-# gimmie an editor, make it a nice vi clone
-for EDITOR in vimx vim elvis vile nvi vi ; do
+# gimmie an editor, make it emacs or a nice vi clone
+# but you can't find a vi clone keep trying!!
+for EDITOR in vimx vim elvis vile nvi vi emacs nano pico; do
 	command -v $EDITOR >/dev/null 2>&1 && break
 done
 export EDITOR
diff --git a/emacsrc b/emacsrc.el
similarity index 99%
rename from emacsrc
rename to emacsrc.el
index 5e25a727..b2270867 100644
--- a/emacsrc
+++ b/emacsrc.el
@@ -63,7 +63,7 @@
 
 ;; Turn on line numbering (hopefully with linum-mode)
 (if (boundp 'global-linum-mode) 
-	'(global-linum-mode 1)
+	(global-linum-mode 1)
 	(desire 'linum "linum.el"
 			'(global-linum-mode 1)
 			'(global-line-number-mode 1)))
diff --git a/install.py b/install.py
index 26e3c31c..db390c61 100755
--- a/install.py
+++ b/install.py
@@ -17,7 +17,7 @@
 	'_vimrc':   '_vimrc',
 	'gvimrc':   '.gvimrc',
 
-	'emacsrc':  '.emacs',
+	'emacsrc.el':  '.emacs',
 	'emacs':    '.emacsdir',
 
 	'commonsh': '.commonsh',
diff --git a/lock b/lock
index 7aa286e1..8f568540 100755
--- a/lock
+++ b/lock
@@ -33,7 +33,7 @@ fi
 # Certain combinations of desktop managers and locking programs
 # allow new sessions to be started.
 KDE_LOCK='kdesktop_lock --forcelock || krunner_lock --forcelock || /usr/libexec/kde4/krunner_lock --forcelock || /usr/lib/kde4/libexec/krunner_lock --forcelock'
-GNOME_LOCK='gnome-screensaver-command --lock'
+GNOME_LOCK='gnome-screensaver-command --lock || dbus-send --type=method_call --dest=org.gnome.ScreenSaver /org/gnome/ScreenSaver org.gnome.ScreenSaver.Lock'
 XSCREEN_LOCK='xscreensaver-command -lock || xlock'
 
 if ps -e | grep gdm >/dev/null 2>/dev/null ; then