- reduced complexity for the last F-rated method
- various small fixes