Updates watcher
Song can be removed (need a warning thought).
Corrects encoding problem