retired some todos and added updates post-planeride