Minor enhancements after rehearsal #1