diff --git a/events.xml b/events.xml
index 938b6ca..5ad765e 100644
--- a/events.xml
+++ b/events.xml
@@ -4,22 +4,23 @@
 <eventdefs>
 
 <!-- Spring 2009 -->
-<eventitem date="2009-06-22" time="16:30" room="MC 4xxx" title="Paper Club">
-    <short><p>
-     Come and drink tea and read an academic CS paper with the Paper Club.
-     We will be meeting from 4:30pm until 6:30pm on Monday, June 22th
-     on the 4th floor of the MC (exact room number TBA).
-     See http://csclub.uwaterloo.ca/~paper
+<eventitem date="2009-06-22" time="4:30 PM" etime="6:30 PM" room="MC 4xxx" 
+	   title="Paper Club">
+    <short><p> Come and drink tea and read an academic CS paper with
+     the Paper Club.  We will be meeting from 4:30pm until 6:30pm on
+     Monday, June 22th on the 4th floor of the MC (exact room number
+     TBA).  See http://csclub.uwaterloo.ca/~paper
     </p></short>
 </eventitem>
 
-<eventitem date="2009-06-19" time="17:30" room="Dooly's" title="Dooly's Night">
+<eventitem date="2009-06-19" time="5:30 PM" room="Dooly's" title="Dooly's Night">
     <short><p>
     The CSC will be playing pool at Dooly's. Join us for only a few dollars.
     </p></short>
 </eventitem>
 
-<eventitem date="2009-06-05" time="19:00" room="MC 3001" title="Code Party">
+<eventitem date="2009-06-05" time="7:00 PM" edate="2009-06-06" etime-"4:00 AM"
+	   room="MC 3001" title="Code Party">
     <short><p>
      Have an assignment or project you need to work on? We
      will be coding from 7:00pm until 7:00am starting on Friday, June 5th
@@ -27,7 +28,7 @@
     </p></short>
 </eventitem>
 
-<eventitem date="2009-06-02" time="16:30" room="MC 2037" title="Unix 101">
+<eventitem date="2009-06-02" time="4:30 PM" room="MC 2037" title="Unix 101">
     <short><p>
         Need to use the UNIX environment for a course, want to overcome your fears of
         the command line, or just curious? Come and learn the arcane secrets of the
@@ -37,7 +38,7 @@
     </p></short>
 </eventitem>
 
-<eventitem date="2009-05-12" time="12:00 noon" room="MC 2034" title="PHP on Windows">
+<eventitem date="2009-05-12" time="12:00 PM" room="MC 2034" title="PHP on Windows">
     <short><p>PHP Programming Contest Info Session</p></short>
     <abstract><p>
     Port or create a new PHP web application and you could win a prize