fixed date error
updated errors
stuff
fixed conflicts