finnaly, did all last fixes