after adding holidays (for Rahel), fixing some codes that were broken.

But still needs better solution for customized @dates.