Misc improvements

Improvements on some labels, comments, and song ids.