Update some polling, formatting