fixed all but login critical big