modify data structures and fix a bunch of broken async stuff in users [#331]