small fixes thanks Sagi