Added comments and fixed temporary user system