graphics
fixed conflicts
bunch of stuff
fixed conflicts
infinite run graphics