more 3.11.3, + clean up 3.10 stuff