adding last fixes