userstate
minor changes