improved pot polling&handling