added some bullshit hack fixes