some small changes and hack to make multi-spectators work somewhat