optimizations
removed crap
fixed conflicts