Fixed bugs, user authentication is better