* a few improvements