correted tabled and fix bugs for holidays