finally some last fixes