fixed literally everything...for now