Added missing fields to holiday, added todos