removed some really crappy merge conflict bullshit and added some tiny improvements