Added Headers, days are synced with server, clean up