Spectator cleanup and fixed border bugs