first pass of server_info/state revisions
Reformatted the user-related calls into a slightly more verbose format