fixed lots of things, poll plugin updated