fixes according to Shahar comments