latest fixes for trainer tool