Add a sample Spectator
Bug fixes