Users endpoints + tweaks