Small changes and fixed userproblem