Added users & fix issues