fixes and future polls