fixed bunch of bullshit