added user info and some other stuff