last fixes for today...