last fixes :D