User addition

and little other changes