added polls and minor changes/fixes