add some comment and date logic modification