All properties on context are optional

Also added some missing </td> tags.