Version from after class (in a newly cloned copy)
Small fixes per Deian
Add a few annotations reflecting the current label state.