Shattered Faith - Help me please!

[massb]

Any californian early punk fan here??

I recently picked up the Shattered Faith CD "Bootleg" (LINK) which should include all their tracks but there are no song titles (so no dates nor original source).

I searched on the web and I created the following tracking list.
Is it correct?

1. Right Is Right (LP Rodney On The Roq: Volume 2 – Posh Boy 1981)
2. Short Haired Thugs (LP Vol.2 – Slag/Erika 1985)
3. Final Conflict (LP Live! – Prophet 1982)*
4. I Love America (45 - Posh Boy 1981)
5. Last Name First (LP Vol.2 – Slag/Erika 1985)
6. What Happened (LP Vol.2 – Slag/Erika 1985)
7. Another Day Passes (LP The Future Looks Bright – Posh Boy 1981)
8. Too Tense ()
9. No Fun, No Friends (LP Live! – Prophet 1982)*
10. The Verdict (LP The Future Looks Bright – Posh Boy 1981)
11. Always The Same (LP Live! – Prophet 1982)*
12. Victims Of Society (LP Vol.2 – Slag/Erika 1985)
13. Trilogy (LP The Future Looks Bright – Posh Boy 1981)
14. Dark Side (LP Live! – Prophet 1982)*
15. Reagan Country (45 - Posh Boy 1981)
16. Hard To Be Free (LP Live! – Prophet 1982)*
17. Reckless Ways (LP Vol.2 – Slag/Erika 1985)
18. Strange Daze (LP Live! – Prophet 1982)*
19. Our Time (LP Vol.2 – Slag/Erika 1985)
20. Discontent (LP Who Cares – American Standard 1981)
21. Baby Baby ()
22. Secret Sex (2004)
23. Too Tense (LP Live! – Prophet 1982)
24. USA (LP Live! – Prophet 1982)
25. Right Is Right (LP Live! – Prophet 1982)
26. Mirrors Reflect (LP Live! – Prophet 1982)
27. Trilogy (LP Live! – Prophet 1982)
28. Born To You (LP Live! – Prophet 1982)

*Recorded on studio

Thanks in advance!!