last fixes before addressing review comments