More Tuning

There is an issue still with dt. Too tired to pursue.