Fixed some more bullshit