Fixed more of the shit that jack broken