Further improvments with the best test results so far.