last fixes , better