add user creation, squash some bugs