fix time
fix comment and add tag