Adding more benchmark scenarios.
Adding some static code analysis suggestions.