Dumb fix in choices menu (ugh); sync and updates with some new changes to Tektite core, mostly for rearranging geom2d_ops