fixed conflicts and graphics w00t