Utility fix, and better parameters