Add poll goal
Bugfixes