- update training group model to make more sense
- redo some other work to read easier