Some refactoring. Lyrics audit. Notification display separation.