last fixes for tonite