last fixes according to mike's comment