So, here's the complete and correct tracklist now:
1. Late, Always
2. They're not Waving
3. Treacherous
4. Test of Endurance
5. Tactless Questions
6. Freakscene
7. Bad Move
8. Hideaway
9. The Ring Road
10. To the End
11. Happy Thoughts
This is the (official) track list Marti...meaning, there might be a hidden track
And, yes she sold the Bird Talk EP at her shows, as well as the Happy Thoughts Single.
And, yes, They're not Waving is the 'improved or remastered' version (as Vyv put it) on the album.
Pics are coming soon...