Updated to-do and a few fixes in preparation of the 24/04-25/04 drop.