changed some paths around
fixed conflicts
modify time format