fixed some user issues