use long polling across the board, trying to work around the race condition with multiple masters; some other cleanups