Add DailyActivity modeling and some fixes