STY/BUG: flake8 and missed some r_server changes
BUG: needed to check that update_status was not None