users added and fixed bugs