User refactor part 3 + documentation fixes