fixes according to Irina comments