Added from_holiday, some more fixes