Fix to the polls plus very basic timer