Some refactoring + 2 new songs