Fix a silly bug, and add some labels.