s1m0n was in the credits for 1.16, but that was missed when his contributions were copied to master. Fix that, along with adding his latest updates. The fuzzy flag in -wof probably got readded by mistake when rebasing.