Fix date and add some 's'