More guider work

Need to make training work, and simpler