More spectator tweaks and CTF stuff

Yep, got a bug in my ass to change CTF stuff