diff --git a/SocialFeaturesMelangeGSoC2010.wiki b/SocialFeaturesMelangeGSoC2010.wiki
index 8eef9ab..eed3895 100644
--- a/SocialFeaturesMelangeGSoC2010.wiki
+++ b/SocialFeaturesMelangeGSoC2010.wiki
@@ -68,10 +68,10 @@
   * project_details – *ListProperty* (pull from program database)
   * feed_url - *LinkProperty*
   * user_page_status - *StringProperty*
-  * tags - *StringProperty* (for filtering in maps+calendars searches)
+  * tags - *ListProperty* (list of Tag entities for filtering in maps+calendars searches)
 
 -----
-Comment (madhu): I think you must really use tag framework in Melange here and use the tag property.
+*Suggestion Incorporated* Comment (madhu): I think you must really use tag framework in Melange here and use the tag property.
 -----
 
 
@@ -157,19 +157,22 @@
 _soc.modules.social.models.event.py_
 
 Properties of for event.py
-  * owner - *ReferenceProperty*
+  * created_by - *ReferenceProperty*
+  * created_on - *DateTimeProperty*
+  * modified_by - *ReferenceProperty*
+  * modified_on - *DateTimeProperty*
   * event_name - *StringProperty*
   * description – *StringProperty*
-  * lat_location – *FloatProperty*
-  * long_location – *FloatProperty*
+  * location – *GeoPtProperty*
   * is_org_event – *BooleanProperty*
   * organization - *ReferenceProperty*
+  * program - *ReferenceProperty*
   * status - *StringProperty*
   * time - *DateTimeProperty*
-  * tags - *StringProperty*
+  * tags - *ListProperty* (list of Tag entities from Melange's Tag framework)
 
 -----
-Comment (madhu): 
+*Suggestion Incorporated* Comment (madhu): 
   # Same as above. You may want to use tag framework for tags. 
   # Also you may want created by and created on along with modified by and modified on properties. 
   # Also you may want to use http://code.google.com/appengine/docs/python/datastore/typesandpropertyclasses.html#GeoPtProperty GeoPtProperty here instead of Lat Lng location float properties. The reason why it was used in previous model was because this property was not in Appengine then. But now we have!
@@ -185,12 +188,12 @@
 
 Based on the calendar(org or program) in which the event is meant to be published, the status property is set to either of the three values.
 
-  * *is_requested* : If the current user is not the owner of the calendar where the event is to be published, then this state is set by default. When it is approved by the owner, this is set to is_approved.
-  * *is_approved* : If the current user is the owner of the calendar where the event is to be published, then this state is set by default. Else if the event is approved by the owner, this state is set for the event.
-  * *is_declined* : If the calendar owner chooses to decline an event request this state is set.
+  * *requested* : If the current user is not the owner of the calendar where the event is to be published, then this state is set by default. When it is approved by the owner, this is set to is_approved.
+  * *approved* : If the current user is the owner of the calendar where the event is to be published, then this state is set by default. Else if the event is approved by the owner, this state is set for the event.
+  * *declined* : If the calendar owner chooses to decline an event request this state is set.
 
 -----
-Comment (madhu): For clarity reasons I think it is better to name these values *requested*, *approved* and *declined* since they are not really Boolean fields but a 3-state property.
+*Suggestion Incorporated* Comment (madhu): For clarity reasons I think it is better to name these values *requested*, *approved* and *declined* since they are not really Boolean fields but a 3-state property.
 -----