final tweaks after talk with Alex