diff --git a/nodes.ia b/nodes.ia
index d1590e9..9dfe702 100644
--- a/nodes.ia
+++ b/nodes.ia
@@ -1,55 +1,73 @@
 profiles core;
 
+# Computer Science Club Office Terminals
+
 @strombola
-profiles office amd64;
+profiles csclub office machine amd64;
 
 @maltodextrin
-profiles office amd64;
+profiles csclub office machine amd64;
 
 @natural-flavours
-profiles office amd64;
+profiles csclub office machine amd64;
 
 @bit-shifter
-profiles office amd64;
+profiles csclub office machine amd64;
+
+# Computer Science Club Servers (General Use)
 
 @caffeine
-profiles server amd64;
-
-@artificial-flavours
-profiles server i386;
+profiles csclub server container amd64 general-use;
 
 @taurine
-profiles server amd64 X general-use csclub;
+profiles csclub server machine amd64 general-use X;
 
 @corn-syrup
-profiles server amd64 general-use csclub;
-
-@glomag
-profiles server amd64;
-
-@sodium-benzoate
-profiles server amd64;
-
-@ginseng
-profiles server amd64;
+profiles csclub server machine amd64 general-use;
 
 @ascorbic-acid
-profiles server sparc;
+profiles csclub server machine sparc general-use;
 
 @potassium-citrate
-profiles server alpha;
+profiles csclub server machine alpha general-use;
+
+# Computer Science Club Servers (Restricted)
+
+@glomag
+profiles csclub server machine amd64;
+
+@sodium-benzoate
+profiles csclub server machine amd64;
+
+@ginseng
+profiles csclub server machine amd64;
+
+@artificial-flavours
+profiles csclub server machine i386;
+
+# Computer Science Club Misc Machines
+
+# unrestricted but too slow for general-use
+@sodium-citrate
+profiles csclub server machine mips;
+
+# Computational Math Club Office Terminals
 
 @inkpen
-profiles office i386;
+profiles cmclub office machine i386;
 
 @one-hole-punch
-profiles office i386;
+profiles cmclub office machine i386;
 
 @two-hole-punch
-profiles office i386;
+profiles cmclub office machine i386;
+
+# Computational Math Club Servers
 
 @staples
-profiles server amd64;
+profiles cmclub server machine amd64;
+
+# Miscellaneous
 
 @i386
 profiles x86;
@@ -61,7 +79,7 @@ profiles x86;
 profiles general-use karmic X;
 
 @general-use
-profiles devel-core devel-full machine-core auth-core nfs-core;
+profiles devel-core devel-full auth-core nfs-core;
 
 @server
-profiles lenny machine-core auth-core nfs-core;
+profiles lenny auth-core nfs-core;
diff --git a/packages.ia b/packages.ia
index a3584d6..068b854 100644
--- a/packages.ia
+++ b/packages.ia
@@ -44,11 +44,16 @@ if core {
 };
 
 # physical machine (non virtual server)
-if machine-core {
+if machine {
     install lm-sensors smartmontools hwinfo lshw
             @x86 acpid;
 };
 
+# container (virtual server)
+if container {
+    remove udev initramfs-tools pm-utils radeontool acpid;
+};
+
 if auth-core {
     install nscd libnss-ldapd ldap-utils libpam-krb5 krb5-user ldapvi;
 
@@ -154,11 +159,12 @@ if devel-full {
             python-openssl python-pexpect python-pgsql python-pyasn1
             python-pysnmp4 python-sqlobject python-subversion python-tk
             python-urwid python-xmpp drpython ipython pylint pychecker
-            pyflakes jython jython-doc
-            python-beautifulsoup python-chardet python-clientform python-cups
-            python-cupsutils python-kerberos python-mako python-notify python-pyme
-            python-rpm python-selinux python-setuptools python-simplejson
-            python-sqlite python-sqlitecachec python-urlgrabber;
+            pyflakes python-beautifulsoup python-chardet python-clientform
+            python-cups python-cupsutils python-kerberos python-mako
+            python-notify python-pyme python-rpm python-selinux
+            python-setuptools python-simplejson python-sqlite
+            python-sqlitecachec python-urlgrabber
+            @x86 jython @x86 jython-doc;
 
     # ruby
     install ruby ruby-dev rubygems irb rake ruby1.9 ruby1.9-dev;