Again, a few improvements