diff --git a/packages.ia b/packages.ia
index 8440523..f57b6fe 100644
--- a/packages.ia
+++ b/packages.ia
@@ -195,7 +195,7 @@ if @devel-full {
             python-openssl python-pexpect python-pyasn1
             python-pysnmp4 python-sqlobject python-subversion
             python-urwid python-xmpp drpython ipython pylint pychecker
-            pyflakes python-beautifulsoup python-chardet python-clientform
+            pyflakes python-beautifulsoup python-chardet
             python-kerberos python-mako
             python-pyme python-rpm python-selinux
             python-setuptools python-simplejson python-sqlite
@@ -240,14 +240,15 @@ if @devel-full {
     install comerr-dev e2fslibs-dev libcap-dev
             libattr1-dev libacl1-dev libselinux1-dev libpcre3-dev python-dev
             libapt-pkg-dev linux-libc-dev libgnutls-dev libkrb5-dev
-            libreadline6-dev/libreadline5-dev libncurses5-dev libncursesw5-dev
-            libghc6-x11-dev libghc6-mtl-dev libghc6-mtl-prof libghc6-mtl-doc
-            libghc6-network-dev libghc-parsec3-dev/libghc6-parsec-dev
-            libboost-dev zlib1g-dev libbz2-dev libcurl4-gnutls-dev libexpat1-dev
-            libglib2.0-dev libgmp3-dev libsasl2-dev libsctp-dev libsqlite3-dev
-            libssl-dev libxml2-dev libxslt1-dev ss-dev mesa-common-dev uuid-dev
-            libprotobuf-c0-dev libprotobuf-dev @amd64 ia32-libs libffi-dev
-            libidl-dev libelf-dev libdw-dev libaudit-dev libsigc++-dev;
+	    libreadline6-dev/libreadline5-dev libncurses5-dev libncursesw5-dev
+	    libghc6-mtl-dev libghc6-mtl-prof libghc6-mtl-doc
+	    libghc6-network-dev libghc-parsec3-dev/libghc6-parsec-dev
+	    libboost-dev zlib1g-dev libbz2-dev libcurl4-gnutls-dev
+	    libexpat1-dev libglib2.0-dev libgmp3-dev libsasl2-dev libsctp-dev
+	    libsqlite3-dev libssl-dev libxml2-dev libxslt1-dev ss-dev
+	    mesa-common-dev uuid-dev libprotobuf-c0-dev libprotobuf-dev @amd64
+	    ia32-libs libffi-dev libidl-dev libelf-dev libdw-dev libaudit-dev
+	    libsigc++-dev;
 
     @x-core
     install xorg-dev libgtk2.0-dev libqt4-dev
@@ -343,22 +344,24 @@ if @general-use {
             octave3.2-emacsen/octave3.0-emacsen
 	    octave3.2-headers/octave3.0-headers;
     @!lenny
-    install octave-ad octave-audio octave-benchmark
-            octave-combinatorics octave-communications-common
-            octave-communications octave-control octave-data-smoothing
-            octave-econometrics octave-epstk octave-financial octave-fixed octave-fpl
-            octave-ftp octave-ga octave-general octave-gsl octave-ident octave-image
-            octave-informationtheory octave-io octave-irsa
-            octave-linear-algebra octave-mapping octave-miscellaneous
-            octave-missing-functions octave-multicore octave-nan
-            octave-nlwing2 octave-nnet octave-nurbs octave-ocs octave-octcdf
-            octave-octgpr octave-odepkg octave-optim octave-optiminterp
-            octave-outliers octave-parallel octave-pdb
-            octave-pkg-dev octave-plot octave-secs1d octave-secs2d octave-signal
-            octave-simp octave-sockets octave-specfun octave-splines octave-statistics
-            octave-strings octave-struct octave-symband octave-symbolic octave-time
-            octave-tsa octave-vrml octave-zenity octave-pfstools
-            octave-plplot octave-sp;
+    install octave-audio octave-benchmark octave-communications-common
+	    octave-communications octave-control octave-data-smoothing
+	    octave-econometrics octave-epstk octave-financial octave-fixed
+	    octave-fpl octave-ga octave-general octave-gsl octave-image
+	    octave-io octave-linear-algebra octave-mapping octave-miscellaneous
+	    octave-missing-functions octave-nan octave-nnet octave-nurbs
+	    octave-ocs octave-octcdf octave-octgpr octave-odepkg octave-optim
+	    octave-optiminterp octave-parallel octave-pkg-dev octave-plot
+	    octave-secs1d octave-secs2d octave-signal octave-specfun
+	    octave-splines octave-statistics octave-strings octave-struct
+	    octave-symbolic octave-time octave-tsa octave-vrml octave-zenity
+	    octave-pfstools octave-plplot octave-sp;
+
+    # These don't exist in precise.
+    @!lenny @!precise
+    install octave-ad octave-combinatorics octave-ftp octave-ident
+            octave-informationtheory octave-irsa octave-multicore octave-nlwing2
+            octave-outliers octave-pdb octave-simp octave-sockets octave-symband;
 
     # xml
     install xsltproc libxml2-utils docbook-xsl docbook-utils docbook-dsssl
@@ -467,7 +470,8 @@ if @X {
     install xtrkcad @!lenny freecad pythoncad;
 
     # gnome
-    install gnome-themes-extras gnome-themes-standard gnome-themes-ubuntu rhythmbox gnome-rdp;
+    install gnome-themes-extras gnome-themes-standard gnome-themes-ubuntu
+            rhythmbox gnome-rdp @precise gnome-session-fallback;
 
     # kde
     install @!kdebase kdebase-runtime kdeutils
@@ -480,7 +484,7 @@ if @X {
     install geda arduino ngspice bristol cl-rlc electric
             gerbv gnucap gpsim gsmc gspiceui gtkwave linsmith
             oregano pcb pcb-gtk qucs tkgate xcircuit xsmc-calc
-            eagle kic kicad;
+            kic kicad;
 
     # virtualization
     install virtualbox-ose;
@@ -497,8 +501,9 @@ if @core {
     remove gnome-games nethack-common;
 
     # evil packages
-    remove pulseaudio avahi-daemon evolution-data-server accountsservice
-           @ubuntu ureadahead lirc joe mlocate locate pidentd;
+    remove pulseaudio avahi-daemon evolution-data-server 
+           @ubuntu ureadahead lirc joe mlocate locate pidentd
+           @ubuntu gnome-keyring;
 
     # useless packages
     remove winbind @!audio timidity @!lenny modemmanager