A bunch of bullshit fixes