Fix song persistence
closes #2
closes #14 (somewhat by accident)