Updates to highstate, roles, and teardown