Fixes shuffing in training
Fixes some problems with training and adds predict