Various changes during training

Some various changes we made during our last residential training.