new poll editor and some fixes