just a few improvements