Fixed bug on update (remove end date) and halfway doing the commenting