add max listeners
refactor wikipedia watchlist