1. Fixed an issue with requirements which would exclude most versions of 3.9
2. Assorted bugfixes