Minor enhancements after the first test round with my colleagues.