polling works; various changes