Cyoansfw: Fixed

If you're ready, I can also provide a general outline for a long review, which we can use as a starting point: