some last fixes