Fixed polling, made swing mode better

Now polling works properly, I hope
Swing mode changes show up better in the app