done last fixes