More fixes i forget even what i did

woops