last fixes added