Still a few left out edges, but much better.