Don't forget:
1. Big Girls Are Best (released as ATYCLB B-side)
2. Stateless (didn't make album but used for MDH Soundtrack)
3. The Ground Beneath Her Feet (didn't make album but used for MDH Soundtrack & extra album track for UK).
Also, I think 'Are You Gonna Wait Forever' is from the HTDAAB...