holiday: some more cleanup and updates