Fix date and add location