Added date changing
Fixed bugs