Add auth and fix poll