removed console.logs
fixed date format for safari
fixed alot of bugs
fixed merge conflicts