Finished some user stories and fixed the date formating