Better smoke trail, and clearing bad commits.