fixed literally everything