Improved Spectator mode... somewhat