Improve trainer and davide bot