Training set updated

Not final, needs to add more options & fix some bugs