Some fix on training/movements definition