fixes remaining names
fixes date formatting