added trainers and other bugs removed