fix misc bug, done holiday