fix date, small changes