fix some of the bullshit