Add oDate and tidy up event delegate binding