bunch of changes
fixed conflicts