ocorrencia poll added and some cleanup