fixed bugs and changed date to ms