essay, res fix, more
Merge branch 'user-model'