changed date formatting and added no 0 function