user manager stuff and some fixes in other stuff