A few more speed improvements