batch of updates including TODO for next week!