fixed more trainer tool bugs