fixed more trainer tool bugs
Merge pull request #35 from dmilisav/master

Fixed more trainer tool bugs.