Fixed shortcut mistakes in Polling, added functionality