Fixing bugs and adding user